Author: fredkiefer
Date: Sun Mar 5 23:12:15 2017
New Revision: 40362
URL: http://svn.gna.org/viewcvs/gnustep?rev=40362&view=rev
Log:
Merge some of the changes from the testplant branch.
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Headers/AppKit/NSImage.h
libs/gui/trunk/Headers/AppKit/NSSplitView.h
libs/gui/trunk/Source/NSImage.m
libs/gui/trunk/Source/NSProgressIndicator.m
libs/gui/trunk/Source/NSTableHeaderView.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=40362&r1=40361&r2=40362&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Sun Mar 5 23:12:15 2017
@@ -1,3 +1,12 @@
+2017-03-05 Fred Kiefer <[email protected]>
+
+ * Headers/AppKit/NSImage.h
+ * Headers/AppKit/NSSplitView.h
+ * Source/NSImage.m
+ * Source/NSProgressIndicator.m
+ * Source/NSTableHeaderView.m
+ Merge some of the changes from the testplant branch.
+
2017-02-20 Fred Kiefer <[email protected]>
* Source/GSHorizontalTypesetter.m (-layoutLineNewParagraph:): Add
Modified: libs/gui/trunk/Headers/AppKit/NSImage.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Headers/AppKit/NSImage.h?rev=40362&r1=40361&r2=40362&view=diff
==============================================================================
--- libs/gui/trunk/Headers/AppKit/NSImage.h (original)
+++ libs/gui/trunk/Headers/AppKit/NSImage.h Sun Mar 5 23:12:15 2017
@@ -83,6 +83,45 @@
NSImageCacheNever
} NSImageCacheMode;
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
+APPKIT_EXTERN NSString *const NSImageNameQuickLookTemplate;
+APPKIT_EXTERN NSString *const NSImageNameBluetoothTemplate;
+APPKIT_EXTERN NSString *const NSImageNameIChatTheaterTemplate;
+APPKIT_EXTERN NSString *const NSImageNameSlideshowTemplate;
+APPKIT_EXTERN NSString *const NSImageNameActionTemplate;
+APPKIT_EXTERN NSString *const NSImageNameSmartBadgeTemplate;
+APPKIT_EXTERN NSString *const NSImageNameIconViewTemplate;
+APPKIT_EXTERN NSString *const NSImageNameListViewTemplate;
+APPKIT_EXTERN NSString *const NSImageNameColumnViewTemplate;
+APPKIT_EXTERN NSString *const NSImageNameFlowViewTemplate;
+APPKIT_EXTERN NSString *const NSImageNamePathTemplate;
+APPKIT_EXTERN NSString *const NSImageNameInvalidDataFreestandingTemplate;
+APPKIT_EXTERN NSString *const NSImageNameLockLockedTemplate;
+APPKIT_EXTERN NSString *const NSImageNameLockUnlockedTemplate;
+APPKIT_EXTERN NSString *const NSImageNameGoRightTemplate;
+APPKIT_EXTERN NSString *const NSImageNameGoLeftTemplate;
+APPKIT_EXTERN NSString *const NSImageNameRightFacingTriangleTemplate;
+APPKIT_EXTERN NSString *const NSImageNameLeftFacingTriangleTemplate;
+APPKIT_EXTERN NSString *const NSImageNameAddTemplate;
+APPKIT_EXTERN NSString *const NSImageNameRemoveTemplate;
+APPKIT_EXTERN NSString *const NSImageNameRevealFreestandingTemplate;
+APPKIT_EXTERN NSString *const NSImageNameFollowLinkFreestandingTemplate;
+APPKIT_EXTERN NSString *const NSImageNameEnterFullScreenTemplate;
+APPKIT_EXTERN NSString *const NSImageNameExitFullScreenTemplate;
+APPKIT_EXTERN NSString *const NSImageNameStopProgressTemplate;
+APPKIT_EXTERN NSString *const NSImageNameStopProgressFreestandingTemplate;
+APPKIT_EXTERN NSString *const NSImageNameRefreshTemplate;
+APPKIT_EXTERN NSString *const NSImageNameRefreshFreestandingTemplate;
+APPKIT_EXTERN NSString *const NSImageNameBonjour;
+APPKIT_EXTERN NSString *const NSImageNameComputer;
+APPKIT_EXTERN NSString *const NSImageNameFolderBurnable;
+APPKIT_EXTERN NSString *const NSImageNameFolderSmart;
+APPKIT_EXTERN NSString *const NSImageNameNetwork;
+#endif
+
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
+APPKIT_EXTERN NSString *const NSImageNameFolder;
+#endif
@interface NSImage : NSObject <NSCoding, NSCopying>
{
Modified: libs/gui/trunk/Headers/AppKit/NSSplitView.h
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Headers/AppKit/NSSplitView.h?rev=40362&r1=40361&r2=40362&view=diff
==============================================================================
--- libs/gui/trunk/Headers/AppKit/NSSplitView.h (original)
+++ libs/gui/trunk/Headers/AppKit/NSSplitView.h Sun Mar 5 23:12:15 2017
@@ -38,6 +38,9 @@
enum {
NSSplitViewDividerStyleThick = 1,
NSSplitViewDividerStyleThin = 2,
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
+ NSSplitViewDividerStylePaneSplitter = 3,
+#endif
};
typedef NSInteger NSSplitViewDividerStyle;
#endif
Modified: libs/gui/trunk/Source/NSImage.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSImage.m?rev=40362&r1=40361&r2=40362&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSImage.m (original)
+++ libs/gui/trunk/Source/NSImage.m Sun Mar 5 23:12:15 2017
@@ -59,6 +59,41 @@
BOOL NSImageForceCaching = NO; /* use on missmatch */
static NSDictionary *nsmapping = nil;
+
+// OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
+NSString *const NSImageNameQuickLookTemplate = @"NSQuickLookTemplate";
+NSString *const NSImageNameBluetooth = @"NSBluetoothTemplate";
+NSString *const NSImageNameIChatTheater =
@"NSIChatTheaterTemplate";
+NSString *const NSImageNameSlideshow = @"NSSlideshowTemplate";
+NSString *const NSImageNameAction = @"NSActionTemplate";
+NSString *const NSImageNameSmartBadge = @"NSSmartBadgeTemplate";
+NSString *const NSImageNameIconView = @"NSIconViewTemplate";
+NSString *const NSImageNameListView = @"NSListViewTemplate";
+NSString *const NSImageNameColumnView = @"NSColumnViewTemplate";
+NSString *const NSImageNameFlowView = @"NSFlowViewTemplate";
+NSString *const NSImageNamePath = @"NSPathTemplate";
+NSString *const NSImageNameInvalidDataFreestanding =
@"NSInvalidDataFreestandingTemplate";
+NSString *const NSImageNameLockLocked = @"NSLockLockedTemplate";
+NSString *const NSImageNameLockUnlocked =
@"NSLockUnlockedTemplate";
+NSString *const NSImageNameGoRight = @"NSGoRightTemplate";
+NSString *const NSImageNameGoLeft = @"NSGoLeftTemplate";
+NSString *const NSImageNameRightFacingTriangle =
@"NSRightFacingTriangleTemplate";
+NSString *const NSImageNameLeftFacingTriangle =
@"NSLeftFacingTriangleTemplate";
+NSString *const NSImageNameAdd = @"NSAddTemplate";
+NSString *const NSImageNameRemove = @"NSRemoveTemplate";
+NSString *const NSImageNameRevealFreestanding =
@"NSRevealFreestandingTemplate";
+NSString *const NSImageNameFollowLinkFreestanding =
@"NSFollowLinkFreestandingTemplate";
+NSString *const NSImageNameEnterFullScreen =
@"NSEnterFullScreenTemplate";
+NSString *const NSImageNameExitFullScreen =
@"NSExitFullScreenTemplate";
+NSString *const NSImageNameStopProgress =
@"NSStopProgressTemplate";
+NSString *const NSImageNameStopProgressFreestanding =
@"NSStopProgressFreestandingTemplate";
+NSString *const NSImageNameRefresh = @"NSRefreshTemplate";
+NSString *const NSImageNameRefreshFreestanding =
@"NSRefreshFreestandingTemplate";
+NSString *const NSImageNameBonjour = @"NSBonjour";
+NSString *const NSImageNameComputer = @"NSComputer";
+NSString *const NSImageNameFolderBurnable = @"NSFolderBurnable";
+NSString *const NSImageNameFolderSmart = @"NSFolderSmart";
+NSString *const NSImageNameNetwork = @"NSNetwork";
@interface NSView (Private)
- (void) _lockFocusInContext: (NSGraphicsContext *)ctxt inRect: (NSRect)rect;
Modified: libs/gui/trunk/Source/NSProgressIndicator.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSProgressIndicator.m?rev=40362&r1=40361&r2=40362&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSProgressIndicator.m (original)
+++ libs/gui/trunk/Source/NSProgressIndicator.m Sun Mar 5 23:12:15 2017
@@ -161,6 +161,17 @@
}
_isRunning = NO;
+ _count = 0;
+ [self setNeedsDisplay: YES];
+}
+
+- (BOOL) isHidden
+{
+ if (!_isRunning && !_isDisplayedWhenStopped)
+ {
+ return YES;
+ }
+ return [super isHidden];
}
- (BOOL) usesThreadedAnimation
@@ -296,6 +307,7 @@
_style = style;
_count = 0;
[self setDisplayedWhenStopped: (style == NSProgressIndicatorBarStyle)];
+ [self setBezeled: (style == NSProgressIndicatorBarStyle)];
[self sizeToFit];
[self setNeedsDisplay: YES];
}
@@ -331,9 +343,6 @@
- (void) drawRect: (NSRect)rect
{
double val;
-
- if (!_isRunning && !_isDisplayedWhenStopped)
- return;
if (_doubleValue < _minValue)
val = 0.0;
@@ -419,6 +428,54 @@
if ([aDecoder allowsKeyedCoding])
{
+ // things which Gorm encodes, but IB doesn't care about.
+ // process Gorm encodings that IB doesn't care about first
+ // otherwise we overwrite settings read in from XIB...
+ if ([aDecoder containsValueForKey: @"GSDoubleValue"])
+ {
+ _doubleValue = [aDecoder decodeDoubleForKey: @"GSDoubleValue"];
+ }
+ else
+ {
+ _doubleValue = _minValue;
+ }
+
+ if ([aDecoder containsValueForKey: @"GSIsBezeled"])
+ {
+ _isBezeled = [aDecoder decodeBoolForKey: @"GSIsBezeled"];
+ }
+ else
+ {
+ _isBezeled = YES;
+ }
+
+ if ([aDecoder containsValueForKey: @"GSIsVertical"])
+ {
+ _isVertical = [aDecoder decodeBoolForKey: @"GSIsVertical"];
+ }
+ else
+ {
+ _isVertical = NO;
+ }
+
+ if ([aDecoder containsValueForKey: @"GSUsesThreadAnimation"])
+ {
+ _usesThreadedAnimation = [aDecoder decodeBoolForKey:
@"GSUsesThreadAnimation"];
+ }
+ else
+ {
+ _usesThreadedAnimation = NO;
+ }
+
+ if ([aDecoder containsValueForKey: @"GSAnimationDelay"])
+ {
+ _animationDelay = [aDecoder decodeDoubleForKey: @"GSAnimationDelay"];
+ }
+ else
+ {
+ _animationDelay = 5.0 / 60.0; // 1 twelfth a a second
+ }
+
// id matrix = [aDecoder decodeObjectForKey: @"NSDrawMatrix"];
if ([aDecoder containsValueForKey: @"NSMaxValue"])
{
@@ -461,52 +518,6 @@
_controlSize = NSRegularControlSize;
[self setStyle: NSProgressIndicatorBarStyle];
}
-
- // things which Gorm encodes, but IB doesn't care about.
- if ([aDecoder containsValueForKey: @"GSDoubleValue"])
- {
- _doubleValue = [aDecoder decodeDoubleForKey: @"GSDoubleValue"];
- }
- else
- {
- _doubleValue = _minValue;
- }
-
- if ([aDecoder containsValueForKey: @"GSIsBezeled"])
- {
- _isBezeled = [aDecoder decodeBoolForKey: @"GSIsBezeled"];
- }
- else
- {
- _isBezeled = YES;
- }
-
- if ([aDecoder containsValueForKey: @"GSIsVertical"])
- {
- _isVertical = [aDecoder decodeBoolForKey: @"GSIsVertical"];
- }
- else
- {
- _isVertical = NO;
- }
-
- if ([aDecoder containsValueForKey: @"GSUsesThreadAnimation"])
- {
- _usesThreadedAnimation = [aDecoder decodeBoolForKey:
@"GSUsesThreadAnimation"];
- }
- else
- {
- _usesThreadedAnimation = NO;
- }
-
- if ([aDecoder containsValueForKey: @"GSAnimationDelay"])
- {
- _animationDelay = [aDecoder decodeDoubleForKey: @"GSAnimationDelay"];
- }
- else
- {
- _animationDelay = 5.0 / 60.0; // 1 twelfth a a second
- }
}
else
{
Modified: libs/gui/trunk/Source/NSTableHeaderView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSTableHeaderView.m?rev=40362&r1=40361&r2=40362&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSTableHeaderView.m (original)
+++ libs/gui/trunk/Source/NSTableHeaderView.m Sun Mar 5 23:12:15 2017
@@ -520,7 +520,7 @@
p = [self convertPoint: unconverted fromView: nil].x;
if (mouseDragged == NO)
{
- NSLog(@"TODO: Deselect the column");
+ [self setNeedsDisplay:YES];
}
mouseDragged = YES;
if (p < minVisCoord || p > maxVisCoord)
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
