Gregory John Casamento
75122ac78e
Server name to #define
2020-02-01 04:33:25 -05:00
Gregory John Casamento
f891819498
Add code to connect with server
2020-02-01 04:30:36 -05:00
Gregory John Casamento
9ee975860a
Clean build for NSSpeechRecognizer
2020-02-01 04:16:48 -05:00
Sergii Stoian
a7aa7d014d
* Source/GSTitleView.m (mouseDown:): limit menu movement to screen
...
frame for top/left/right edges. Menu can be moved to the bottom until
title is completely visible.
2020-01-31 02:31:19 +02:00
Gregory John Casamento
2756be99e5
Merge branch 'master' into NSFontCollection_branch
2020-01-30 07:48:16 -05:00
Gregory John Casamento
2b388c6a88
Finish initialization method
2020-01-30 07:47:10 -05:00
Gregory John Casamento
772e4242a1
Finish initialization method
2020-01-30 07:46:41 -05:00
Gregory John Casamento
fac43795d6
Implement methods to modify font collections
2020-01-30 07:13:08 -05:00
Gregory John Casamento
f6555d14b0
Updates
2020-01-30 06:23:35 -05:00
Richard Frith-Macdonald
36343b81b1
Fix error in format string
2020-01-30 09:29:55 +00:00
Sergii Stoian
71056e625a
Merge branch 'master' into master
2020-01-28 14:46:26 +02:00
Sergii Stoian
1146f35276
* Source/NSWindow.m (applicationDidChangeScreenParameters:): use enumerator
...
to go through the list of screens. Removed commented out debug output.
2020-01-28 12:15:39 +02:00
Gregory John Casamento
697f6ba699
Add NSCTFontCollection so we can decode NSFontCollection
2020-01-27 02:31:11 -05:00
Gregory John Casamento
57d6be305b
Implement copyWithZone and mutableCopyWithZone
2020-01-26 21:53:28 -05:00
Sergii Stoian
a4174f2838
* Source/NSWindow.m (applicationDidChangeScreenParameters): take into
...
account screen origin change during window position recalculation.
* Source/NSScreen.m (dealloc): debug output was removed.
2020-01-27 00:47:08 +02:00
Gregory John Casamento
b41444e4c4
Correct errors and begin implementation of copy methods
2020-01-26 16:26:47 -05:00
Gregory John Casamento
15a2b03eab
Add setters and getters in NSMutableFontCollection
2020-01-26 14:42:25 -05:00
Sergii Stoian
d4ea1a490f
* Source/NSWindow.m (initWithContentRect:styleMask:backing:defer:):
...
added observer of NSApplicationDidChangeScreenParametersNotification.
(applicationDidChangeScreenParameters:): callback for added notification -
updates window position, set new screen object and saves frame if
autosave name exists.
* Source/NSScreen.m (initialize): remove observer of
NSApplicationDidChangeScreenParametersNotification - NSScreen shouldn't
do it. Backend explicitely calls -resetScreens before posting notification.
(_initWithScreenNumber:): ditto.
(_resetScreens): removed.
(deviceDescription): removed duplicated addition of NSDeviceSize object.
* Source/NSApplication.m (finishLaunching): remove observer of
NSApplicationDidChangeScreenParametersNotification.
2020-01-26 03:13:16 +02:00
Gregory John Casamento
73bbad4059
Initial implementation of NSFontCollection methods.
2020-01-25 19:14:17 -05:00
Gregory John Casamento
479dca0b6d
Remove from NSFontCollection.m
2020-01-25 17:49:42 -05:00
Gregory John Casamento
607861def6
Move constants to extern.m
2020-01-25 17:25:55 -05:00
Gregory John Casamento
2f50bad42f
Update gitignore
2020-01-25 13:19:33 -05:00
fredkiefer
8a000a6ce2
Remove useless code as the real object is at that time nil.
2020-01-24 22:59:41 +01:00
fredkiefer
db57ab7885
Replace the NSWindowTemplate5 by the runtime attribute @"NSWindowTemplate.visibleAtLaunch"
2020-01-24 21:47:49 +01:00
Sergii Stoian
731abde796
* Source/NSScreen.m (_initWithScreenNumber:): add self as observer to
...
NSApplicationDidChangeScreenParametersNotification.
(frame): use `_frame` ivar since libs-back recreates screens list.
(dealloc): remove observer.
(applicationDidChangeScreenParameters:): update _frame and _depth
ivars for bad behaving objects which retain NSScreen and not observing
screen parameters changes.
2020-01-24 19:48:28 +02:00
fredkiefer
8c08f0c4b3
Move XIB type detection from GSXibLoader to GSXIBKeyedUnarchiver.
2020-01-24 17:30:28 +01:00
fredkiefer
3541c564e6
Fix typo spotted by Greg.
2020-01-24 16:51:36 +01:00
fredkiefer
978c58bcde
HACK to get KVO to work on the array controller class.
2020-01-24 16:50:47 +01:00
Sergii Stoian
41dc7fa9cd
Fixed permissions.
2020-01-23 13:57:42 +02:00
Sergii Stoian
232b70967a
* Source/NSScreen.m (dealloc): removed unneeded -removeObserver call.
2020-01-23 12:51:51 +02:00
Sergii Stoian
50b7d772c2
* Source/NSScreen.m: retrun back accedentially removed comment.
2020-01-23 12:49:25 +02:00
Sergii Stoian
211d9bcc46
* Source/NSScreen.m (frame): removed extra semicolon.
2020-01-23 12:47:17 +02:00
Sergii Stoian
e0af3bd8c9
* Source/NSMenu.m (_screenChanged): removed.
...
(initWithTitle:): remove observer for
NSApplicationDidChangeScreenNotification.
2020-01-23 12:46:03 +02:00
Sergii Stoian
f322393161
* Source/NSApplication.m (finishLaunching): oberver for
...
NSApplicationDidChangeScreenParametersNotification was added.
2020-01-23 02:10:27 +02:00
Sergii Stoian
fbc08684f4
* Source/NSMenu.m (_initWithScreenNumber:): removed observer for
...
NSApplicationDidChangeScreenParametersNotification.
(_updateScreenInfo:): removed obsever action.
(frame): get screen diension from display server (-boundsForScreen)
to get actual numbers.
2020-01-23 02:08:55 +02:00
Sergii Stoian
dcec52e7be
* Source/NSMenu.m: fixed typo in comment.
2020-01-23 02:05:07 +02:00
fredkiefer
3ac76af826
Move toolbar ivar from NSWindowTemplate5 to NSWindowTemplate.
2020-01-22 20:29:19 +01:00
Sergii Stoian
b3113cd66f
* Source/NSScreen.m: (_initWithScreenNumber): observe notification from
...
baackend on screen changes (display resolution).
* Source/NSScreen.m: (_updateScreenInfo): initial implementation.
2020-01-22 19:15:57 +02:00
Gregory Casamento
22612a641c
Merge pull request #47 from gnustep/NSTouchBar_branch
...
NSTouchBar branch
2020-01-20 16:47:17 -05:00
Gregory John Casamento
2c3e755825
Move storyboard stuff to storyboard branch
2020-01-20 15:59:25 -05:00
Gregory John Casamento
1e2d243735
Start on storyboard
2020-01-20 15:52:31 -05:00
Gregory John Casamento
d507e88dec
Add skeletons
2020-01-20 15:48:02 -05:00
fredkiefer
60fc987fb7
Fix compiler warnings
2020-01-20 20:57:32 +01:00
fredkiefer
e2c59a7bee
Merge branch 'master' into xib_document
2020-01-20 19:12:15 +01:00
fredkiefer
09853bffc8
Fix indentation
2020-01-20 19:10:15 +01:00
Gregory Casamento
08c7bbdeaf
Merge pull request #46 from gnustep/NSDataAsset_branch
...
NSDataAsset branch
2020-01-19 20:44:18 -05:00
Gregory John Casamento
08cf9c3545
fix years
2020-01-19 20:43:49 -05:00
Gregory John Casamento
765e9bfecd
Change NSString to NSDataAssetName.
2020-01-19 20:42:40 -05:00
Gregory Casamento
25bdc6e89c
Merge pull request #45 from gnustep/NSAppearance_branch
...
NSAppearance branch
2020-01-19 20:19:28 -05:00
Gregory John Casamento
9919d63d29
Add dealloc
2020-01-19 16:11:06 -05:00
fredkiefer
bc7c0262c5
Clean up the old XIB loading code.
2020-01-19 18:52:36 +01:00
fredkiefer
46ea0fb36d
Merge branch 'master' into xib_document
...
# Conflicts:
# ChangeLog
2020-01-19 17:24:04 +01:00
fredkiefer
42d771d589
Get master to guild again after breakage of last commit.
2020-01-19 17:21:51 +01:00
fredkiefer
50bc834ddc
Add decoding of binding options and handle bindings to arrays
...
with transformations correctly.
2020-01-19 13:08:58 +01:00
Gregory John Casamento
c31ec536a2
NSNibOutletConnector and NSNibControlConnector classes added
2020-01-18 19:24:41 -05:00
fredkiefer
00bb2396a6
Diverse imporvements to get my XIB5 test application running.
2020-01-18 16:03:24 +01:00
Gregory John Casamento
7ba1d5f570
ASSIGN in initWithCoder:
2020-01-17 17:45:41 -05:00
Gregory John Casamento
a6c7d1d8fc
Add NSDataAsset
2020-01-17 17:34:43 -05:00
Gregory John Casamento
0b23edea63
Add dealloc
2020-01-17 17:29:58 -05:00
Gregory John Casamento
810232cdad
Correct some additional issues
2020-01-17 10:06:00 -05:00
Gregory John Casamento
9f2869bc82
Fix a couple of Fred's concerns.
2020-01-17 08:20:33 -05:00
Gregory John Casamento
e17c1287b3
Encoding
2020-01-15 10:39:44 -05:00
Gregory John Casamento
0a402df303
Implement copy
2020-01-15 10:02:58 -05:00
Gregory John Casamento
d9c42f8cc8
Clean compilation
2020-01-15 08:19:59 -05:00
fredkiefer
aeafa9578e
Add generic mechanism to decode keys that include the class name.
...
Also add header clip view to subviews of scroller.
2020-01-12 21:10:54 +01:00
fredkiefer
3a6176b0cf
Add observable array and use it for arrangeObjects.
2020-01-12 21:02:16 +01:00
fredkiefer
d7676fb7c2
Use decodeSizeForKey:.
2020-01-12 21:00:00 +01:00
fredkiefer
eb9fd58dce
Merge branch 'master' into xib_document
...
# Conflicts:
# .gitignore
# ChangeLog
2020-01-11 19:47:13 +01:00
fredkiefer
5f147345fc
Improve predicate editor decoding.
2020-01-11 19:33:24 +01:00
fredkiefer
97cb13a5ff
Add some more bindings
2020-01-10 20:53:53 +01:00
Sergii Stoian
9a58a93ee5
* Images/common_StepperDown.tiff,
...
* Images/common_StepperDownHighlighted.tiff,
* Images/common_StepperUp.tiff,
* Images/common_StepperUpHighlighted.tiff: new images with arrows
similar to scroll view buttons'.
* Source/GSThemeDrawing.m (stepperUpButtonRectWithFrame:),
(stepperDownButtonRectWithFrame:): center buttons horizontally; simplify
and cleanup.
* Source/NSStepper.m (acceptsFirstResponder): return NO. Returning
YES makes sense only if `keyDown:` is implemented.
(acceptsFirstMouse:): return YES.
* Source/NSStepperCell.m (cellSize): initial implementation. Retruns
minimum size based on up and button sizes.
2020-01-10 15:46:22 +02:00
fredkiefer
668ae592f5
Remove unneeded class mappings.
2020-01-07 21:38:07 +01:00
fredkiefer
14f88edfe8
Merge branch 'master' into xib_document
...
# Conflicts:
# ChangeLog
2020-01-07 21:27:20 +01:00
fredkiefer
c0714b0de1
Add minimal version of predicate editor copied over from mySTEP.
2020-01-07 21:25:21 +01:00
fredkiefer
9a9f32d1b5
Use a formatter in the NSDatePickerCell.
2020-01-07 17:38:03 +01:00
fredkiefer
dc955b1ce4
Add minimal version of date picker copied over from mySTEP.
2020-01-06 22:25:54 +01:00
fredkiefer
f6ce68d177
Add decoding for object controller and subclasses.
2020-01-06 20:17:23 +01:00
fredkiefer
210ce65e17
Correct handling of NSSelectedIndex and other references.
...
Add celltitle as a meta font name.
2020-01-06 14:30:04 +01:00
fredkiefer
05b35bd8a6
Small clean up.
2020-01-03 22:15:40 +01:00
fredkiefer
e868f47488
Add changelog entry.
2020-01-03 21:58:32 +01:00
fredkiefer
d45ce451f9
Move XIB type detection into GSXibLoader.m
2020-01-03 18:21:28 +01:00
fredkiefer
97891ed2bb
Add definition of NSWindowStyleMask.
...
Fix some indentation.
Remove commented out code.
2020-01-03 17:49:47 +01:00
fredkiefer
0792f3080d
Handle "message" as a font value and adjust the other values to
...
match the current GNUstep defaults.
2020-01-02 18:16:16 +01:00
fredkiefer
d810eb6945
Work on indentation.
2020-01-01 22:51:40 +01:00
fredkiefer
fd3c43c00d
Merge branch 'master' into xib_document
2020-01-01 22:29:05 +01:00
fredkiefer
378bb98c12
Remove more commented out code.
...
Extract search button method.
2020-01-01 22:28:40 +01:00
fredkiefer
2f5e2b3c84
More renaming.
2020-01-01 16:46:18 +01:00
fredkiefer
f0b36d6ee8
Removed commented out elements from XmlTagToDecoderSelectorMap
2020-01-01 16:36:15 +01:00
fredkiefer
40a9e5f7b2
Fix description methods.
2020-01-01 16:23:03 +01:00
fredkiefer
9ba7063a45
Better handling of state attribute.
2020-01-01 16:10:36 +01:00
fredkiefer
3ce90ffd8a
Minor spelling corrections
2020-01-01 14:13:59 +01:00
fredkiefer
0420155566
Clean up code for class NSCustomObject5.
2020-01-01 13:46:53 +01:00
fredkiefer
8b506e12b7
Better handling for DEBUG_XIB5
2020-01-01 13:39:38 +01:00
fredkiefer
250be5c957
Correct indentation.
2020-01-01 13:32:54 +01:00
fredkiefer
b6b28cc41c
Better warning text for missing root obejects in XIB.
2020-01-01 13:32:10 +01:00
fredkiefer
d14a7d4ae8
Remove confusing comments.
2020-01-01 13:28:51 +01:00
fredkiefer
65445f6e4f
Spelling correction and removal of a newline.
2020-01-01 13:24:39 +01:00
fredkiefer
cc8f4e6137
Document purpose and origin of coding flags.
2019-12-31 18:33:50 +01:00
fredkiefer
560f68323b
* Source/NSBundleAdditions.m (-pathForNibResource:): Report type
...
not filename while iterating.
2019-12-29 22:19:24 +01:00
fredkiefer
d25610bf6a
Merge branch 'master' into xib_document
2019-12-24 13:15:38 +01:00
fredkiefer
13c87bc9d0
"pullsDown" should not default to true.
2019-12-24 11:36:56 +01:00
Gregory John Casamento
a8360c0de4
Add string constants
2019-12-22 21:38:14 -05:00
fredkiefer
5c9c641113
Reenable userDefinedRuntimeAttribute handling that got lost.
...
Correct releasing of reference elements.
Add more font attributes and get the values from NSFont.
2019-12-22 13:46:50 +01:00
Sergii Stoian
1d0d5595a0
* Source/NSBrowser.m (frameOfColumn:): shift up column only for browser
...
with separated sparated columns layout.
(tile): fix column height calculation; moved sanity check of column
height closer to calculation; removed code that duplicates code below.
2019-12-18 17:35:59 +02:00
Sergii Stoian
3086184b2b
* Source/GSThemeDrawing.m (drawScrollViewRect:inView:): minor variables fixes for
...
variables usage.
2019-12-17 19:50:45 +02:00
Sergii Stoian
7c6a22d174
* Source/NSScrollView.m (tile): tweak location and height of vertical
...
scroller if header or corner view available.
* Source/GSThemeDrawing.m: (drawTableCornerView:withClip:): do not draw
black rectangle because -drawDarkButton:withClip: draws all necessary
elements.
* Source/GSThemeDrawing.m (drawScrollViewRect:inView:): further cleanup
of method implementation. Removed all tweaks of scroller length - all
required calculations must be done in NSScrollView's -tile method. Simplified
caluclations of X and Y positions of scroller.
2019-12-17 17:30:51 +02:00
Sergii Stoian
20db33e008
* Source/GSThemeDrawing.m (drawScrollViewRect:inView:):
...
Use [self sizeForBorderType: borderType] to determine border width.
2019-12-17 13:29:30 +02:00
Sergii Stoian
5c96e8ba02
* Source/GSThemeDrawing.m (drawScrollViewRect:inView:): fixed scroller
...
border positionning and length - do not overlap border if any.
2019-12-17 02:16:05 +02:00
fredkiefer
cbda1229ed
Improve string shortening for display.
2019-12-14 18:22:03 +01:00
fredkiefer
d6cfd60462
Add handling for resources. Currently only works for images.
2019-12-14 17:46:29 +01:00
fredkiefer
c542f5df99
Fix accicental copy
2019-12-14 16:35:37 +01:00
fredkiefer
6483cf5037
Handle boolean values with a default of YES once.
...
Remove duplicated code to decode specific types.
Correct handling of NSNoAutoenable.
2019-12-14 14:23:43 +01:00
fredkiefer
9977b1a921
Imporve toolbar loading.
...
Build toolbar after NIB loading it.
2019-12-13 23:58:14 +01:00
fredkiefer
bb22c61d3b
Simplifiy special code for connections.
...
Use helper method to create references.
Add toolbar support for windows template.
2019-12-13 18:21:49 +01:00
fredkiefer
e3c9e91ec1
Merge branch 'master' into xib_document
2019-12-13 16:56:09 +01:00
fredkiefer
2b701f8ba3
Add entries for toolbar item
2019-12-13 16:53:56 +01:00
Sergii Stoian
5884e55419
* Source/NSFont.m (smallSystemFontSize): return 10 as default value.
...
Update documention comment regarding default values for NSMiniFontSize
ans NSSmallFontSize.
2019-12-12 23:20:12 +02:00
fredkiefer
cffa72f107
Add first keys for toolbar decoding
2019-12-12 21:18:45 +01:00
fredkiefer
d5b913c53b
Move string UTF8 handling code to super class, where there is similar code.
2019-12-12 17:18:35 +01:00
fredkiefer
83963f9d2a
More code simplifications.
2019-12-11 23:46:44 +01:00
Sergii Stoian
e5a7cba164
* Source/NSWindow.m
...
(initialize): use MiniWindowTile image for miniwindow tile.
(drawRect:): adjusted position of title cell to fit tile image.
(setTitle:): disable drawing of title cell background;
use NSMiniControlSize font size for miniwindow title cell.
* Source/NSFont.m (systemFontSizeForControlSize:): increased default font
size for NSMiniControlSize.
2019-12-11 14:30:44 +02:00
Sergii Stoian
063e5708e7
Merge pull request #37 from trunkmaster/master
...
Insertion point height fix for NSText* objects
2019-12-11 12:23:06 +02:00
Sergii Stoian
1d19c11923
* Source/GSHorizontalTypesetter.m: removed extra imports left from
...
last 2 commits.
2019-12-11 12:13:09 +02:00
fredkiefer
3b48bd6277
Simplify alternate name generation
2019-12-11 10:20:48 +01:00
Gregory John Casamento
5f66cf232c
Compiling skeleton
2019-12-11 01:17:44 -05:00
Gregory John Casamento
2c883a428b
Implement skeleton
2019-12-11 01:09:41 -05:00
Gregory John Casamento
9769e652cd
Header skeleton builds
2019-12-11 00:52:27 -05:00
Gregory John Casamento
eb2815acf3
Initial add of NSFontCollection files
2019-12-10 21:18:24 -05:00
fredkiefer
ed79392a09
Four outlet use source instead of target.
2019-12-10 23:38:35 +01:00
fredkiefer
4b8a25072c
Add code from Eggplant to shorten strings when displaying in a rect.
...
This code has been partially rewritten.
2019-12-10 22:23:51 +01:00
Sergii Stoian
fcee2e2c63
* Headers/Additions/GNUstepGUI/GSLayoutManager.h,
...
Source/GSLayoutManager.m: new method -typingAttributes returns default typing
attributes of NSTextView.
* Source/NSLayoutManager.m: override GSLayoutManager's -typingAttributes - primitive
method - provides access to _typingAttributes ivar.
* Source/GSHorizontalTypesetter.m: use new GSLayoutManager's -typingAttributes method
to get paragraph style and font of new empty text container. Normally `curLayoutManager`
is a NSLayoutManager object so actually we get NSLayoutManager's _typingAttributes.
2019-12-10 19:23:04 +02:00
fredkiefer
f30ec504a4
Merge branch 'master' into xib_document
...
# Conflicts:
# Source/GSXibParser.m
2019-12-10 17:14:25 +01:00
fredkiefer
519d00ea99
Handle menu items with the standard mechanism.
2019-12-10 16:59:08 +01:00
Sergii Stoian
5415783c56
* Source/GSHorizontalTypesetter.m: (_addExtraLineFragment) get paragraph style and
...
font from NSLayoutManager's typing attributes. Fixes insertion point height for empty
text objects (NSTextView, NSTexField etc.).
2019-12-10 02:09:13 +02:00
Gregory John Casamento
defbd3889f
Merge branch 'master' of github.com:gnustep/libs-gui
2019-12-09 18:45:23 -05:00
Gregory John Casamento
32a5712945
Fix address and license name in all files.
2019-12-09 18:45:15 -05:00
fredkiefer
a69826e40a
Started small cleanups.
2019-12-09 16:35:29 +01:00
fredkiefer
244e7a48d7
Remove now obsolete GSXibParser.
...
Move over more Eggplant changes.
Add basic decoding for bindings.
2019-12-09 14:22:33 +01:00
fredkiefer
9032de5842
Merge branch 'master' into xib_document
2019-12-09 11:16:39 +01:00
Sergii Stoian
01ccd98752
* NSStringDrawing: fixed incorrect string drawing (shortened, misplaced)
...
in ART backend. It seems that third parameter to `cache_lookup` function
(useScreenFonts) is valuable for ART but not for Cairo backend.
2019-12-09 01:18:53 +02:00
fredkiefer
378c1c4077
Take over the Eggplant code for XIB document decoding,
...
with slight cleanups to get it working with gcc.
2019-12-08 23:47:53 +01:00
fredkiefer
451afde6a7
* Headers/AppKit/NSGestureRecognizer.h
...
* Source/NSGestureRecognizer.m: Restore code by Daniel Ferreira
* Headers/AppKit/NSButtonTouchBarItem.h
* Headers/AppKit/NSCandidateListTouchBarItem.h
* Headers/AppKit/NSClickGestureRecognizer.h
* Headers/AppKit/NSColorPickerTouchBarItem.h
* Headers/AppKit/NSCustomTouchBarItem.h
* Headers/AppKit/NSGroupTouchBarItem.h
* Headers/AppKit/NSMagnificationGestureRecognizer.h
* Headers/AppKit/NSPanGestureRecognizer.h
* Headers/AppKit/NSPickerTouchBarItem.h
* Headers/AppKit/NSPopoverTouchBarItem.h
* Headers/AppKit/NSPressGestureRecognizer.h
* Headers/AppKit/NSRotationGestureRecognizer.h
* Headers/AppKit/NSSharingServicePickerTouchBarItem.h
* Headers/AppKit/NSSliderTouchBarItem.h
* Headers/AppKit/NSStepperTouchBarItem.h
* Headers/AppKit/NSTouchBarItem.h
Clean up after Greg's commit.
2019-12-06 22:50:13 +01:00
Gregory John Casamento
bdadefeebd
Add all files and fix compilation
2019-12-06 05:01:51 -05:00
Gregory John Casamento
b0b20cd32e
Add macOS specific class skeletons
2019-12-05 12:57:38 -05:00
Gregory John Casamento
7e81e90e02
Removed all instances of include in new files.
2019-12-04 12:02:49 -05:00
Gregory John Casamento
f5026dfa97
include -> import
2019-12-04 08:40:35 -05:00
Gregory John Casamento
5b8db43dd2
Delegate to the rep instead of using the lower level function
2019-12-04 08:22:43 -05:00
Gregory John Casamento
676066b94d
Fix issue with formatting
2019-12-04 08:16:26 -05:00
Gregory John Casamento
335e529cd5
Add NSCIImageRep added in
2019-12-03 18:47:36 -05:00
Gregory John Casamento
4c56da1c57
Remove 'heron' from headers
2019-12-03 17:26:19 -05:00