Incorporated nextspace-theme in libs-gui building process. GlobalDefaults.plist moved into Libraries/gnustep directory.

Author: trunkmaster

…Library/Preferences/GlobalDefaults.plist Libraries/gnustep/GlobalDefaults.plistCore/os_files/Library/Preferences/GlobalDefaults.plist renamed to Libraries/gnustep/GlobalDefaults.plist Core/os_files/Library/Preferences/GlobalDefaults.plist renamed to Libraries/gnustep/GlobalDefaults.plist

@@ -3,7 +3,9 @@
 <plist version="0.9">
 <dict>
     <key>GSBackend</key>
-    <string>art</string>
+    <string>cairo</string>
+    <key>GSTheme</key>
+    <string>NextSpace</string>
     <key>GSWorkspaceApplication</key>
     <string>Workspace</string>
     <key>GSCommandKeyString</key>

Libraries/gnustep/nextspace-theme/GNUmakefile

@@ -0,0 +1,27 @@
+# Requires NextSpace's Cairo backend
+# Set by: 'defaults write NSGlobalDomain GSTheme NextSpace'
+
+include $(GNUSTEP_MAKEFILES)/common.make
+
+#GNUSTEP_INSTALLATION_DOMAIN=USER
+
+PACKAGE_NAME = NextSpace
+BUNDLE_NAME = NextSpace
+BUNDLE_EXTENSION = .theme
+VERSION = 0.95
+
+$(BUNDLE_NAME)_INSTALL_DIR=$(GNUSTEP_LIBRARY)/Themes
+$(BUNDLE_NAME)_PRINCIPAL_CLASS = NextSpace
+
+$(BUNDLE_NAME)_OBJC_FILES = \
+	NextSpace.m \
+	NXTScrollerKnobSlotCell.m
+
+$(BUNDLE_NAME)_RESOURCE_FILES = \
+	Resources/*.tiff \
+	Resources/ThemeImages
+
+-include GNUmakefile.preamble
+include $(GNUSTEP_MAKEFILES)/bundle.make
+-include GNUmakefile.postamble
+

Libraries/gnustep/nextspace-theme/NXTScrollerKnobSlotCell.h

@@ -0,0 +1,7 @@
+#import <AppKit/NSButtonCell.h>
+
+@interface NXTScrollerKnobSlotCell : NSButtonCell
+{
+}
+// - (instancetype)initWithBundle:(NSBundle *)themeBundle;
+@end

Libraries/gnustep/nextspace-theme/NXTScrollerKnobSlotCell.m

@@ -0,0 +1,28 @@
+
+#import <AppKit/AppKit.h>
+#import <GNUstepGUI/GSTheme.h>
+
+#import "NextSpace.h"
+#import "NXTScrollerKnobSlotCell.h"
+
+// static NSImage *knobSlotPattern = nil;
+
+@implementation NXTScrollerKnobSlotCell
+
+- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView
+{
+  NSGraphicsContext *ctxt;
+  NextSpace *theme = (NextSpace *)[GSTheme theme];
+
+  if (NSIsEmptyRect(cellFrame)) {
+    return;
+  }
+
+  ctxt = GSCurrentContext();
+  if ([[ctxt className] isEqualToString:@"CairoContext"]) {
+    [ctxt GSSetPatterColor:theme.knobSlotPattern];
+    [ctxt DPSrectfill:cellFrame.origin.x:cellFrame.origin.y:cellFrame.size.width:cellFrame.size.height];
+  }
+}
+
+@end

Libraries/gnustep/nextspace-theme/NextSpace.h

@@ -0,0 +1,8 @@
+#import <AppKit/AppKit.h>
+#import <GNUstepGUI/GSTheme.h>
+
+@interface NextSpace : GSTheme
+{
+}
+@property (readonly) NSImage *knobSlotPattern;
+@end

Libraries/gnustep/nextspace-theme/NextSpace.m

@@ -0,0 +1,104 @@
+#import <AppKit/AppKit.h>
+
+#import "NextSpace.h"
+#import "NXTScrollerKnobSlotCell.h"
+
+@implementation NextSpace
+
+@synthesize knobSlotPattern;
+
+#pragma mark - Init & dealloc
+
+- (void)dealloc
+{
+  [knobSlotPattern release];
+  [super dealloc];
+}
+
+- (NSImage *)knobSlotPattern
+{
+  if (knobSlotPattern == nil) {
+    // NSLog(@"%s: Setting knob slot pattern image...", __func__);
+    NSString *path = [[self bundle] pathForResource:@"SharedGrayAlpha"
+                                             ofType:@"tiff"
+                                        inDirectory:@"Resources"];
+    // NSLog(@"SharedGrayAlpha path %@", path);
+    NSImage *sharedGrayBits = [[NSImage alloc] initWithContentsOfFile:path];
+    NSImage *pattern = [[NSImage alloc] initWithSize:NSMakeSize(12, 12)];
+    NSData *tiffRep;
+
+    [pattern lockFocusOnRepresentation:nil];
+    [sharedGrayBits drawAtPoint:NSZeroPoint
+                       fromRect:NSMakeRect(49, 88, 12, 12)
+                      operation:NSCompositeSourceOver
+                       fraction:1.0];
+    [pattern unlockFocus];
+
+    tiffRep = [pattern TIFFRepresentation];
+    [pattern release];
+    [sharedGrayBits release];
+    knobSlotPattern = [[NSImage alloc] initWithData:tiffRep];
+
+    // NSLog(@"%s: Setting knob slot pattern image - DONE!", __func__);
+  }
+
+  return knobSlotPattern;
+}
+
+#pragma mark - NSScroller
+
+- (NSCell *)cellForScrollerKnobSlot:(BOOL)horizontal
+{
+  NXTScrollerKnobSlotCell *cell;
+
+  cell = [NXTScrollerKnobSlotCell new];
+  [cell setBordered:NO];
+  [cell setTitle:nil];
+
+  return cell;
+}
+
+#pragma mark - NSSlider
+
+- (void)drawSliderBorderAndBackground:(NSBorderType)aType
+                                frame:(NSRect)cellFrame
+                               inCell:(NSCell *)cell
+                         isHorizontal:(BOOL)horizontal
+{
+  if (NSIsEmptyRect(cellFrame)) {
+    return;
+  }
+
+  if (aType == NSBezelBorder) {
+    [self drawGrayBezel:cellFrame withClip:NSZeroRect];
+  } else {
+    [[GSTheme theme] drawBorderType:aType frame:cellFrame view:[cell controlView]];
+  }
+}
+
+- (void)drawBarInside:(NSRect)rect inCell:(NSCell *)cell flipped:(BOOL)flipped
+{
+  if (NSIsEmptyRect(rect)) {
+    return;
+  }
+
+  NSGraphicsContext *ctxt = GSCurrentContext();
+  if ([[ctxt className] isEqualToString:@"CairoContext"]) {
+    [ctxt GSSetPatterColor:self.knobSlotPattern];
+    [ctxt DPSrectfill:rect.origin.x :rect.origin.y :rect.size.width :rect.size.height];
+  }
+}
+
+// - (void)drawKnobInCell:(NSCell *)cell
+// {
+//   NSLog(@"%s", __func__);
+
+//   NSView *controlView = [cell controlView];
+//   NSSliderCell *sliderCell = (NSSliderCell *)cell;
+//   NSRect knobRect = [sliderCell knobRectFlipped:[controlView isFlipped]];
+
+//   [sliderCell drawKnob:knobRect];
+// }
+
+@end
+

Libraries/gnustep/nextspace-theme/NextSpaceInfo.plist

@@ -0,0 +1,11 @@
+{
+    GSThemeAuthors = (
+	    "Sergii Stoian <stoyan255@gmail.com>"
+    );
+    GSThemeDetails = "NEXTSPACE touch ups to GNUstep GUI library.";
+    GSThemeDomain = {
+        GSThemeVersion = "0.95";
+        GSThemeIcon = "NeXT.tiff";
+        GSThemePreview = "ThemePreview.png";
+    };
+}