New icons + fix version

diff --git a/Flat Bezel.xcodeproj/project.pbxproj b/Flat Bezel.xcodeproj/project.pbxproj
index 57b07293b39c2047b86beafd108c726674fb9890..5273a2c1b8b1d53cbeb53a1c49af574af962f724 100644 (file)
--- a/Flat Bezel.xcodeproj/project.pbxproj
+++ b/Flat Bezel.xcodeproj/project.pbxproj
@@ -294,6 +294,7 @@
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
                                MACOSX_DEPLOYMENT_TARGET = 12.0;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
                                MACOSX_DEPLOYMENT_TARGET = 12.0;

+                               MARKETING_VERSION = 1.1.0;

                                PRODUCT_BUNDLE_IDENTIFIER = "pizza.unlimited.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "Flat Bezel";
                                PROVISIONING_PROFILE_SPECIFIER = "";
                                PRODUCT_BUNDLE_IDENTIFIER = "pizza.unlimited.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "Flat Bezel";
                                PROVISIONING_PROFILE_SPECIFIER = "";


@@ -318,6 +319,7 @@
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
                                MACOSX_DEPLOYMENT_TARGET = 12.0;
                                DEVELOPMENT_TEAM = S68NHQVJXW;
                                LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
                                MACOSX_DEPLOYMENT_TARGET = 12.0;

+                               MARKETING_VERSION = 1.1.0;

                                PRODUCT_BUNDLE_IDENTIFIER = "pizza.unlimited.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "Flat Bezel";
                                PROVISIONING_PROFILE_SPECIFIER = "";
                                PRODUCT_BUNDLE_IDENTIFIER = "pizza.unlimited.${PRODUCT_NAME:rfc1034identifier}";
                                PRODUCT_NAME = "Flat Bezel";
                                PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Flat Bezel/BBFlatBezelInterface.m b/Flat Bezel/BBFlatBezelInterface.m
index bac396fbff57bac5136117f491128fdbd315e53e..47af67f475b8aefc3d56f9d48476feb44251e4d6 100644 (file)
--- a/Flat Bezel/BBFlatBezelInterface.m
+++ b/Flat Bezel/BBFlatBezelInterface.m
@@ -40,7 +40,7 @@
       
         [theCell setBackgroundColor:[NSColor clearColor]];
         [theCell setFont:[NSFont systemFontOfSize:11 weight:NSFontWeightLight]];
       
         [theCell setBackgroundColor:[NSColor clearColor]];
         [theCell setFont:[NSFont systemFontOfSize:11 weight:NSFontWeightLight]];

-        [theCell setCellRadiusFactor:4];
+        [theCell setCellRadiusFactor:32];

       
         [theCell setHighlightColor:[NSColor colorWithRed:1 green:1 blue:1 alpha:.15]];
         [theCell setTextColor:[NSColor textColor]];
       
         [theCell setHighlightColor:[NSColor colorWithRed:1 green:1 blue:1 alpha:.15]];
         [theCell setTextColor:[NSColor textColor]];

diff --git a/Flat Bezel/BBObjectCell.m b/Flat Bezel/BBObjectCell.m
index 40bde4dd6cf27bce11ee139a7200b0ef91419809..7bf1b3cc2039984b47f8d1d7d0fe5ff28d0932c3 100644 (file)
--- a/Flat Bezel/BBObjectCell.m
+++ b/Flat Bezel/BBObjectCell.m
@@ -27,7 +27,7 @@
        [strokeColor setStroke];
 
   NSBezierPath *roundRect = [NSBezierPath bezierPath];
        [strokeColor setStroke];
 
   NSBezierPath *roundRect = [NSBezierPath bezierPath];

-  [roundRect appendBezierPathWithRoundedRectangle:cellFrame withRadius:cellRadiusFactor];
+  [roundRect appendBezierPathWithRoundedRectangle:cellFrame withRadius:NSHeight(cellFrame)/cellRadiusFactor];

   [roundRect fill];
 
        [self drawInteriorWithFrame:[self drawingRectForBounds:cellFrame] inView:controlView];
   [roundRect fill];
 
        [self drawInteriorWithFrame:[self drawingRectForBounds:cellFrame] inView:controlView];


@@ -157,4 +157,55 @@
   }
 }
 
   }
 }
 

+- (void)drawIconForObject:(QSObject *)object withFrame:(NSRect)cellFrame inView:(NSView *)controlView {
+  NSImage *image = [object icon];
+  NSString *iconName = nil;
+  NSImageSymbolConfiguration *iconConfig = nil;
+  if ([[image name] isEqualToString: @"defaultAction"]) {
+    iconName = @"gearshape.circle";
+  }
+  else if ([[image name] isEqualToString: @"Find"]) {
+    iconName = @"magnifyingglass";
+  }
+  else if ([[image name] isEqualToString: @"Object"]) {
+    iconName = @"cube.transparent";
+    iconConfig = [NSImageSymbolConfiguration configurationWithHierarchicalColor:[NSColor controlAccentColor]];
+  }
+  else if ([[image name] isEqualToString: @"ContactAddress"]) {
+    iconName = @"mappin.circle";
+  }
+  else if ([[image name] isEqualToString: @"ContactEmail"]) {
+    iconName = @"envelope.circle";
+  }
+  else if ([[image name] isEqualToString: @"ContactPhone"]) {
+    iconName = @"phone.circle";
+  }
+  else if ([[image name] isEqualToString: @"DefaultBookmarkIcon"]) {
+    iconName = @"link.circle";
+  }
+  else if ([[image name] isEqualToString: @"Catalog"]) {
+    iconName = @"sparkles.rectangle.stack";
+  }
+  else if ([[image name] isEqualToString: @"Triggers"]) {
+    iconName = @"bolt.fill";
+  }
+
+  
+  if (iconName != nil) {
+    NSImage *newIcon = [NSImage imageWithSystemSymbolName:iconName accessibilityDescription:[image name]];
+    
+    if (iconConfig == nil) {
+      NSArray *colors = [NSArray arrayWithObjects:[NSColor textColor], [NSColor controlAccentColor], nil];
+      iconConfig = [NSImageSymbolConfiguration configurationWithPaletteColors:colors];
+    }
+
+    QSObject *newObject = [QSObject objectWithName:[object name]];
+    [newObject setIcon:[newIcon imageWithSymbolConfiguration:iconConfig]];
+    [newObject setIconLoaded:[object iconLoaded]];
+    return [super drawIconForObject: newObject withFrame:cellFrame inView:controlView];
+  }
+  
+  [super drawIconForObject: object withFrame:cellFrame inView:controlView];
+}
+

 @end
 @end

diff --git a/Info.plist b/Info.plist
index 8772ba802f68f9efeef0e484f426dcd46c3336e3..c83db37d8641cf1540fd3114b7c5e73fe3be83f6 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>

-       <string>1.0.0</string>
+       <string>$(MARKETING_VERSION)</string>

        <key>CFBundleVersion</key>
        <string>18</string>
        <key>QSPlugIn</key>
        <key>CFBundleVersion</key>
        <string>18</string>
        <key>QSPlugIn</key>