Commit Graph

619 Commits

Author SHA1 Message Date
Michael R Sweet
0919d57c33 Template panel for "new" and "save template" actions, complete with
preview images that are generated when you save the template.

Use @INSTANCE@ anywhere you want to substitute an instance name.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4148 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-20 21:27:20 +00:00
Michael R Sweet
0bc98fd29e Preliminary template save support in FLUID, plus some bug fixes.
fluid/Fl_Type.h:
    - Added read_image() declaration to Fl_Window_Type class.

fluid/Fl_Window_Type.cxx:
    - Added Overlay_Window::read_image() and
      Fl_Window_Type::read_image() functions.
    - Fl_Window_Type::fix_overlay(): update menu indices.
    - toggle_overlays(): update menu indices.

fluid/fluid.cxx:
    - save_template_cb(): Added to save to
      ~/.fltk/fltk.org/fluid/templates, along with PNG screenshot
      of first window.
    - "Save To" instead of "Save to".
    - Use fl_alert() for errors, not fl_message().
    - Add "File/Save Template..." and "File/Print..." (not yet
      implemented) menu items.
    - toggle_widgetbin_cb(): update menu indices.

fluid/undo.cxx:
    - Update menu item indices.
    - Don't need extra slash in undo checkpoint filename.

src/Fl_PNG_Image.cxx:
    - Fix typo in #endif comment.

src/Fl_Window.cxx:
    - Fl_Window::draw(): save/restore flags() when changing label.
    - Fl_Window::iconlabel(): save/restore flags() when changing label.

src/fl_rect.cxx:
    - fl_not_clipped(): don't use current window for gross clipping.





git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4147 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-20 17:41:56 +00:00
Michael R Sweet
4e965380bc Use uppercase letters for shortcut labels (e.g. "Ctrl+N", not
"Ctrl+n") to be consistent with other toolkits.

Remove debug printf from undo_checkpoint().

Change "Show Widget Panel" to "Show Properties" since it displays any
Fl_Type dialog, not just the widget panel.

Add "properties" to all of the type dialogs (UI consistency)

Remove extra elipsis (...) from code items in the new menu.

Revert Grid shortcut to Ctrl+G, since Alt+G is used to run a shell
command again.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4146 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-20 14:35:18 +00:00
Michael R Sweet
eee3897e19 Changelog update.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4143 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-20 04:25:13 +00:00
Michael R Sweet
a2f4b27b27 Undo/redo support for FLUID.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4142 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-20 04:00:48 +00:00
Michael R Sweet
921dabf5b8 Add "scheme" chooser in GUI settings dialog.
Set window image to scheme_bg image when the window is shown.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4140 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-20 00:51:02 +00:00
Michael R Sweet
59004878f3 Many FLUID updates...
fluid/align_widget.cxx:
    - Add widget_size_cb() to set default size and size of
      labels and text for selected widgets.

fluid/factory.cxx:
    - More normalization of menus - "..." when opening a window,
      Capitalized Words.
    - cb(): Assign default label/text size and resize to ideal
      size.
    - Make sure that all buttons, input, and valuator widgets
      have default label strings.
    - Fl_*_Button::ideal_size(): fix ideal width calcs to match
      widget.

fluid/Fl_Menu_Type.cxx:
    - Fl_Menu_Item_Type::make(): set default label size.

fluid/Fl_Type.h:
    - Add Fl_Widget_Type::default_size global.
    - Fl_Menu_Item_Type::type_name(): return "Menu_Item".
    - Fl_Submenu_Type::type_name(): return "Submenu".
    - Update ideal_size() methods to use a default height that
      is evenly divisible by 5.
    - Fl_Choice_Type::ideal_size() and
      Fl_Menubutton_Type::ideal_size(): fix ideal width calcs to
      match widget.
    - Fl_Menu_Bar::ideal_size(): add, returning the window
      width.

fluid/fluid.cxx:
    - Add "Layout/Widget Size" submenu.
    - "File/Write code..." becomes "File/Write Code..." and
      "File/Write strings..." becomes "File/Write Strings..."

fluid/fluid.plist:
    - Bump version number and copyright info.

fluid/Fl_Widget_Type.cxx:
    - Fl_Widget_Type::ideal_size(): add box dw/dh and enforce a
      minimum size of 15x15.
    - labelsize_cb(): use Fl_Widget_Type::default_size instead
      of FL_NORMAL_SIZE.
    - textsize_cb(): use Fl_Widget_Type::default_size instead of
      FL_NORMAL_SIZE.

fluid/Fl_Window_Type.cxx:
    - Fl_Window_Type::newdx(): require at least 2 pixels of
      movement.
    - Fl_Window_Type::draw_overlay(): adjust bounding box for
      outside labels above and below.
    - Fl_Window_Type::handle(): reset dx/dy on FL_PUSH.

fluid/function_panel.cxx:
fluid/function_panel.fl:
fluid/function_panel.h:
    - Update some of the windows for the "small" size.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4129 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-19 04:09:32 +00:00
Michael R Sweet
1e742cc41f Use check items for overlays and the widget bin, and track their state.
Add Edit/Duplicate to duplicate the current selection; this functions
independently of the cut/copy/paste buffer.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4126 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-17 21:57:17 +00:00
Matthias Melcher
93a2170661 fixed frame drawing of Fl_Text_Display (STR #762.2). Thanks for the patch proposal to Alessandro Portale.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4123 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-15 22:50:53 +00:00
Michael R Sweet
23f90b2301 STR 748: Fl_Clock_Output::value(ulong) does not change value_
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4109 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-12 23:18:48 +00:00
Matthias Melcher
00651bc412 Updated CHANGES file. Removed CRLF from xpm Pixmaps
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4093 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-09 21:31:13 +00:00
Matthias Melcher
2bbee87dc3 'Anonymous' reported a problem when using Fl_Value_Input. It seemed,
that contrary to the man pages, a fractional 'step' value above 1
would not create a floating point input.

In fact it does, but the output was formatted wrong so that the 
digits after the decimal point were never rendered.

I changed the Fl_Valuator::format(double v) function how I beleive
it should format the output correctly, but as already stated by
the original author in the source code, this is a hack that should
be fixed by providing a 'precission' setting for valuators.

Anyway. My fix makes sure that all digits right of the decimal 
point are always rendered, so that the step value will show full
precision. This gives a much better behavior in respect to steps values
like 2.5, 3.75, etc., but also leads to 8 digits after the decimal point
for step(1.0/3.0)... .

I suggest that we keep this change (hence the commit), risking that 
rendering of valuator text will change in a few cases (odd step() values).



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4091 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-08 22:55:10 +00:00
Michael R Sweet
9b5555d142 fl_filename_relative() didn't compare drive letters in a
case-insensitive way (STR #741)

src/filename_absolute.cxx:
    - fl_filename_relative(): use tolower() when comparing drive
      letters.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4071 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-05 23:09:36 +00:00
Michael R Sweet
a48c6dd545 Fixed menu item width calculations with symbols (STR #740)
src/Fl_Menu.cxx:
    - Fl_Menu_Item::measure() - initialize w and h to label font
      size so that the symbol size is calculated properly.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4066 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-05 19:53:43 +00:00
Michael R Sweet
2c989c8e4c More browser documentation changes.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4065 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-05 19:31:42 +00:00
Michael R Sweet
b066dea55d The keyboard shortcut handling code did not handle 8-bit
characters properly (STR #731)

src/Fl.cxx:
    - Fl::handle(): use unsigned char * for event_text()
      shortcut key conversion.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4064 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-05 19:23:19 +00:00
Michael R Sweet
c3a5b61223 Doco fixes (show const modifier on methods)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4063 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-05 19:18:07 +00:00
Michael R Sweet
52e086f75b Fl_JPEG_Image could still crash an app with a corrupt JPEG file
(STR #739)

src/Fl_JPEG_Image.cxx:
    - Use setjmp/longjmp to catch JPEG file errors and prevent the
      JPEG library from crashing the FLTK app.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4061 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-05 15:25:30 +00:00
Michael R Sweet
62721060db Using the layout alignment controls on a menu widget would cause
FLUID to crash (STR #742)

The Fl_Input_Choice documentation was not installed (STR #745)

documentation/Makefile:
    - Add Fl_Input_Choice.html to list of doco files.

fluid/align_widget.cxx:
    - Only do a full resize if the widget is not a menu button.
    - Also set modflag when making changes.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4060 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-03-05 15:09:59 +00:00
Michael R Sweet
9cca0a6c9a Added QNX bug workaround for menu handling (STR #704)
src/Fl_Menu.cxx:
    - menuwindow::handle(): #ifdef QNX check for done menu


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4051 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-24 21:51:38 +00:00
Michael R Sweet
2df3459457 Added Greg Ercolano's simple Fl_Input_Choice widget which is a
combination of the Fl_Input and Fl_Menu_Button widgets (STR
#650)

FL/Fl_Input_Choice.H:


documentation/Fl_Input_Choice.html:
    - Added.

documentation/fltk.book:
    - Added Fl_Input_Choice.html + --no-embedfonts option.

documentation/index.html:
    - Update version number and revision.

documentation/input_choice.jpg:
    - Added.

documentation/preface.html:
    - Update version number and revision.

documentation/widgets.html:
    - Add Fl_Input_Choice to lists.

fluid/Fl_Menu_Type.cxx:
    - Add Fl_Input_Choice_Type class and instance.

fluid/Fl_Type.h:
    - Add Fl_Input_Choice_Type class and instance.

fluid/factory.cxx:
    - Add Fl_Input_Choice menu item.

test/Makefile:
    - Add input_choice example.

test/input_choice.cxx:
    - Added.

test/demo.menu:
    - Add input_choice example.




git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4050 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-24 21:14:22 +00:00
Michael R Sweet
97b9464f59 Fl_Multiline_Input now scrolls the full height of the widget
instead of 5 lines when the user presses PageUp or PageDown (STR
#727)

src/Fl_Input.cxx:
    - Set repeat_num to h()/textsize() instead of 5.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4049 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-24 20:35:07 +00:00
Michael R Sweet
3ee9c50180 CMake build fixes (STR #724)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4047 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-24 20:26:22 +00:00
Michael R Sweet
36402b7fe5 Fl_Browser::swap() didn't handle redraws properly when the
swapped lines had different heights (STR #729)

src/Fl_Browser.cxx:
    - Fl_Browser::swap(): call redraw_lines() instead of
      redrawing individual lines.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4046 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-24 20:17:08 +00:00
Michael R Sweet
5b0aae2e87 FL_MOUSEWHEEL events are now sent first to the widget under the
mouse pointer and then to the first widget which accepts them.
This is similar to the way shortcut events are handled and is
consistent with the way the mouse wheel is handled by other
toolkits.

src/Fl.cxx:
    - Fl::handle(): Send FL_MOUSEWHEEL events to grab() or
      current window instead of focus widget.

src/Fl_Group.cxx:
    - Fl_Group::handle(): Send FL_MOUSEWHEEL events first to an
      event_inside() widget, then to the first non-inside widget
      that accepts them.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4045 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-20 00:23:36 +00:00
Michael R Sweet
452c17f8fb Fl::wait() could block on WIN32 if the window was deleted via
Fl::delete_widget() (STR #679)

src/Fl.cxx:
    - Post an application message when a window is hidden on WIN32.

src/Fl_win32.cxx:
    - Change async select message to WM_APP + 1, and document
      our use of WM_APP.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4043 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-14 13:44:24 +00:00
Michael R Sweet
ab8f3f793a Fl_Preferences::RootNode did not find the user's home directory
on some non-US versions of Windows (STR #720)

src/Fl_Preferences.cxx:
    - RootNode::RootNode(): if AppData key does not exist, try Personal
      key instead.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4042 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-14 13:15:39 +00:00
Michael R Sweet
cb852cd3eb Fl_Window::hide() didn't delete the current clipping region on
WIN32, causing a GDI resource leak in some situations (STR #723)

src/Fl.cxx:
    - Fl_Window::hide(): move XDestroyRegion() call outside of
      the X11-specific code.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4041 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-14 11:11:19 +00:00
Matthias Melcher
16cc0e1f9c ...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4037 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 16:31:59 +00:00
Michael R Sweet
f02c5fb451 Fl_Menu now draws the arrow more like other toolkits and 2.0
(STR #651)

src/Fl_Menu.cxx:
    - Change submenu drawing code.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4035 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 02:03:12 +00:00
Michael R Sweet
cb73c93258 Fixed a VC++ compiler error in Fl_JPEG_Image.cxx (STR #676)
src/Fl_JPEG_Image.cxx:
    - Cast array to (uchar *) in delete[].


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4034 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 01:52:15 +00:00
Michael R Sweet
de9bea20b5 FL_SHADOW_BOX/FRAME drew outside of the bounding box (STR #694)
src/fl_boxtype.cxx:
    - Adjust box dw/dh for shadow box/frame types.

src/fl_shadow_box.cxx:
    - Adjust shadow box to draw inside the bounding box.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4033 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 01:42:40 +00:00
Michael R Sweet
b32fefd1c5 Fl_Widget::copy_label(NULL) didn't work (STR #707)
src/Fl_Widget.cxx:
    - Check for NULL in Fl_Widget::copy_label()


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4032 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 01:29:54 +00:00
Michael R Sweet
1f2456132e Cmake updates (STR #645)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4026 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 00:17:50 +00:00
Michael R Sweet
2bbf66c7a4 Clarify Fl_Choice callback description (STR #692)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4025 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 00:12:15 +00:00
Michael R Sweet
2579ae8d1b Fl_Check_Browser didn't draw properly when inactive (STR #681)
src/Fl_Check_Browser.cxx:
    - Update item_draw() function to check active_r()


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4024 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 00:09:17 +00:00
Michael R Sweet
0475dc9363 Removed some redundant code in Fl_Group::handle() (STR #669)
src/Fl_Group.cxx:
    - Don't need to check o->contains() twice.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4023 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-06 00:03:00 +00:00
Michael R Sweet
01e47d8f24 The file chooser didn't always deactivate the OK button when
necessary (STR #653)

src/Fl_File_Chooser2.cxx:
    - Fl_File_Chooser::fileListCB(): deactivate OK button when
      the current item is not the right type.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4021 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-05 23:00:59 +00:00
Michael R Sweet
4d3a3a7f66 Documentation fix (STR #648)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4019 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-05 20:35:51 +00:00
Michael R Sweet
0deaeaa80c Fixed some compiler errors on WIN32 (STR #647)
src/scandir_win32.c:
    - Add casts for malloc and calloc calls.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4017 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-05 19:22:03 +00:00
Michael R Sweet
9527fee96d FLUID didn't update the widget panel X/Y/W/H values when moving
the selected window (STR #701)

fluid/Fl_Window_Type.cxx:
    - Fl_Window_Type::resize(): call update_xywh() on resize.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4012 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-05 18:46:32 +00:00
Michael R Sweet
90590eb8b5 FLUID didn't use the label type constant names for menu items,
causing them to be drawn using the normal label type (STR #668)

fluid/Fl_Menu_Type.cxx:
    - Use FL_*_LABEL constants instead of numeric label types in
      menu items.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4011 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-05 18:36:59 +00:00
Michael R Sweet
3124794f1f Fl_File_Chooser was slow with large directories (STR #654)
FL/Fl_File_Browser.H:
    - Don't reload the directory view unless asked to.

FL/Fl_File_Chooser.H:
    - Rebuilt using current FLUID.

src/Fl_File_Browser.cxx:
    - Don't reload the directory view unless asked to.

src/Fl_File_Chooser.cxx:
    - Fl_File_Chooser::show() calls rescan().

src/Fl_File_Chooser.fl:
    - Fl_File_Chooser::show() calls rescan().

src/Fl_File_Chooser2.cxx:
    - Only call rescan() when chooser is shown.

src/Fl_File_Icon.cxx:
    - Add optimization for Windows - filenames with trailing slash are
      directories.

test/file_chooser.cxx:
    - Only call show() once...



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4010 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-05 18:26:21 +00:00
Michael R Sweet
18b1a2fdca FLUID didn't add xclass() calls to windows (STR #718)
fluid/Fl_Window_Type.cxx:
    - Fl_Window_Type::write_code2() - now write xclass() code when
      xclass is set.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4005 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-02 13:48:08 +00:00
Michael R Sweet
e4ccb4ac07 Fix X11 DND support.
src/Fl_x.cxx:
    - Check the list of source types and pick the first one that
      starts with "text/".


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3995 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-02-01 03:13:01 +00:00
Michael R Sweet
1d871d5744 Temporary fix for JPEG error handle; we need to flag the error in
the callback function and test for it in the main code...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3969 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-01-25 20:50:25 +00:00
Michael R Sweet
fa7293b3cf Fix menu crash bug (STR #685)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3959 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2005-01-04 15:02:57 +00:00
Matthias Melcher
1bc50aa780 Fl_Double_Windows would always redraw their full content, even
if only little changes were done in the UI. OS X creates all
windows double buffered, whch would lead FLTK to beleive that
the background buffer was missing on every redraw, causing a
complete redraw of the full UI.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3953 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-12-27 19:16:42 +00:00
Michael R Sweet
3387edd247 Fl_JPEG_Image did not correctly handle errors reported by the
JPEG library (STR #652)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3946 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-12-16 21:38:24 +00:00
Michael R Sweet
f912892305 Fl_Menu now draws sub-menu arrows like other toolkits and FLTK
2.0 (STR #651)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3941 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2004-12-14 13:49:55 +00:00