skim-app-commit — This tracks source code changes in Subversion.

[Skim-app-commit] SF.net SVN: skim-app:[15123] trunk/SKMainToolbarContr oller.m

[<ho...@us...>]

Revision: 15123
          http://sourceforge.net/p/skim-app/code/15123
Author:   hofman
Date:     2025-04-12 16:59:33 +0000 (Sat, 12 Apr 2025)
Log Message:
-----------
erorder code

Modified Paths:
--------------
    trunk/SKMainToolbarController.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-12 16:26:53 UTC (rev 15122)
+++ trunk/SKMainToolbarController.m	2025-04-12 16:59:33 UTC (rev 15123)
@@ -226,9 +226,9 @@
             [item1 setEnabled:[mainController.pdfView canGoToPreviousPage]];
             NSToolbarItem *item2 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
             [item2 setLabels:NSLocalizedString(@"Next", @"Toolbar item label")];
-            [item2 setEnabled:[mainController.pdfView canGoToNextPage]];
             menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Next", @"Toolbar item label") action:@selector(doGoToNextPage:) target:mainController];
             [item2 setMenuFormRepresentation:menuItem];
+            [item2 setEnabled:[mainController.pdfView canGoToNextPage]];
             [(NSToolbarItemGroup *)item setSubitems:@[item1, item2]];
             
         } else if ([identifier isEqualToString:SKDocumentToolbarPreviousItemIdentifier]) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15122] trunk

[<ho...@us...>]

Revision: 15122
          http://sourceforge.net/p/skim-app/code/15122
Author:   hofman
Date:     2025-04-12 16:26:53 +0000 (Sat, 12 Apr 2025)
Log Message:
-----------
Add separate menu items for zoom in/out toolbar items in label-only mode

Modified Paths:
--------------
    trunk/SKMainToolbarController.m
    trunk/de.lproj/Localizable.strings
    trunk/en.lproj/Localizable.strings
    trunk/es.lproj/Localizable.strings
    trunk/fr.lproj/Localizable.strings
    trunk/it.lproj/Localizable.strings
    trunk/ja.lproj/Localizable.strings
    trunk/nl.lproj/Localizable.strings
    trunk/pl.lproj/Localizable.strings
    trunk/ru.lproj/Localizable.strings
    trunk/zh_CN.lproj/Localizable.strings
    trunk/zh_TW.lproj/Localizable.strings

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-12 16:06:30 UTC (rev 15121)
+++ trunk/SKMainToolbarController.m	2025-04-12 16:26:53 UTC (rev 15122)
@@ -203,7 +203,7 @@
         
         static NSSet *groupIdentifiers = nil;
         if (groupIdentifiers == nil)
-            groupIdentifiers = [NSSet setWithObjects:SKDocumentToolbarPreviousNextItemIdentifier, SKDocumentToolbarPreviousNextFirstLastItemIdentifier, SKDocumentToolbarBackForwardItemIdentifier, SKDocumentToolbarPacerItemIdentifier, nil];
+            groupIdentifiers = [NSSet setWithObjects:SKDocumentToolbarPreviousNextItemIdentifier, SKDocumentToolbarPreviousNextFirstLastItemIdentifier, SKDocumentToolbarBackForwardItemIdentifier, SKDocumentToolbarZoomInOutItemIdentifier, SKDocumentToolbarPacerItemIdentifier, nil];
         
         if ([groupIdentifiers containsObject:identifier])
             item = [[SKToolbarItemGroup alloc] initWithItemIdentifier:identifier];
@@ -356,11 +356,6 @@
             
         } else if ([identifier isEqualToString:SKDocumentToolbarZoomInOutItemIdentifier]) {
             
-            menuItem = [[NSMenuItem alloc] initWithSubmenuAndTitle:NSLocalizedString(@"Zoom", @"Toolbar item label")];
-            menu = [menuItem submenu];
-            [menu addItemWithTitle:NSLocalizedString(@"Zoom In", @"Menu item title") action:@selector(doZoomIn:) target:mainController];
-            [menu addItemWithTitle:NSLocalizedString(@"Zoom Out", @"Menu item title") action:@selector(doZoomOut:) target:mainController];
-            
             [item setLabels:NSLocalizedString(@"Zoom", @"Toolbar item label")];
             [item setToolTip:NSLocalizedString(@"Zoom", @"Tool tip message")];
             [zoomInOutButton setHelp:NSLocalizedString(@"Zoom Out", @"Tool tip message") forSegment:0];
@@ -367,8 +362,19 @@
             [zoomInOutButton setHelp:NSLocalizedString(@"Zoom In", @"Tool tip message") forSegment:1];
             [zoomInOutButton setSegmentStyle:NSSegmentStyleSeparated];
             [item setView:zoomInOutButton];
-            [item setMenuFormRepresentation:menuItem];
             
+            NSToolbarItem *item1 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
+            [item1 setLabels:NSLocalizedString(@"Zoom Out", @"Toolbar item label")];
+            menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Zoom Out", @"Menu item title") action:@selector(doZoomOut:) target:mainController];
+            [item1 setMenuFormRepresentation:menuItem];
+            [item1 setEnabled:[mainController.pdfView canZoomOut]];
+            NSToolbarItem *item2 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
+            [item2 setLabels:NSLocalizedString(@"Zoom In", @"Toolbar item label")];
+            [item2 setEnabled:[mainController.pdfView canZoomIn]];
+            menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Zoom In", @"Menun item title") action:@selector(doZoomIn:) target:mainController];
+            [item2 setMenuFormRepresentation:menuItem];
+            [(NSToolbarItemGroup *)item setSubitems:@[item1, item2]];
+            
         } else if ([identifier isEqualToString:SKDocumentToolbarZoomInActualOutItemIdentifier]) {
             
             menuItem = [[NSMenuItem alloc] initWithSubmenuAndTitle:NSLocalizedString(@"Zoom", @"Toolbar item label")];
@@ -1360,6 +1366,7 @@
 - (void)handleChangedHistoryNotification:(NSNotification *)notification {
     [backForwardButton setEnabled:[mainController.pdfView canGoBack] forSegment:0];
     [backForwardButton setEnabled:[mainController.pdfView canGoForward] forSegment:1];
+    
     NSArray *subitems = [(NSToolbarItemGroup *)[toolbarItems objectForKey:SKDocumentToolbarBackForwardItemIdentifier] subitems];
     [[subitems objectAtIndex:0] setEnabled:[mainController.pdfView canGoBack]];
     [[subitems objectAtIndex:1] setEnabled:[mainController.pdfView canGoForward]];
@@ -1376,6 +1383,7 @@
     [previousNextFirstLastPageButton setEnabled:[mainController.pdfView canGoToPreviousPage] forSegment:1];
     [previousNextFirstLastPageButton setEnabled:[mainController.pdfView canGoToNextPage] forSegment:2];
     [previousNextFirstLastPageButton setEnabled:[mainController.pdfView canGoToLastPage] forSegment:3];
+    
     NSArray *subitems = [(NSToolbarItemGroup *)[toolbarItems objectForKey:SKDocumentToolbarPreviousNextItemIdentifier] subitems];
     [[subitems objectAtIndex:0] setEnabled:[mainController.pdfView canGoToPreviousPage]];
     [[subitems objectAtIndex:1] setEnabled:[mainController.pdfView canGoToNextPage]];
@@ -1392,6 +1400,10 @@
     [zoomActualButton setEnabled:[mainController.pdfView.document isLocked] == NO];
     
     [autoScalesButton setSelected:[mainController.pdfView autoScales] forSegment:0];
+    
+    NSArray *subitems = [(NSToolbarItemGroup *)[toolbarItems objectForKey:SKDocumentToolbarZoomInOutItemIdentifier] subitems];
+    [[subitems objectAtIndex:0] setEnabled:[mainController.pdfView canZoomOut]];
+    [[subitems objectAtIndex:1] setEnabled:[mainController.pdfView canZoomIn]];
 }
 
 - (void)handleAutoScalesChangedNotification:(NSNotification *)notification {

Modified: trunk/de.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/en.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/es.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/fr.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/it.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ja.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/nl.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/pl.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ru.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/zh_CN.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/zh_TW.lproj/Localizable.strings
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15121] trunk/SKMainToolbarController.m

[<ho...@us...>]

Revision: 15121
          http://sourceforge.net/p/skim-app/code/15121
Author:   hofman
Date:     2025-04-12 16:06:30 +0000 (Sat, 12 Apr 2025)
Log Message:
-----------
Reorder code

Modified Paths:
--------------
    trunk/SKMainToolbarController.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-12 16:04:53 UTC (rev 15120)
+++ trunk/SKMainToolbarController.m	2025-04-12 16:06:30 UTC (rev 15121)
@@ -227,9 +227,9 @@
             NSToolbarItem *item2 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
             [item2 setLabels:NSLocalizedString(@"Next", @"Toolbar item label")];
             [item2 setEnabled:[mainController.pdfView canGoToNextPage]];
-            [(NSToolbarItemGroup *)item setSubitems:@[item1, item2]];
             menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Next", @"Toolbar item label") action:@selector(doGoToNextPage:) target:mainController];
             [item2 setMenuFormRepresentation:menuItem];
+            [(NSToolbarItemGroup *)item setSubitems:@[item1, item2]];
             
         } else if ([identifier isEqualToString:SKDocumentToolbarPreviousItemIdentifier]) {
             

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15120] trunk/SKMainToolbarContr oller.m

[<ho...@us...>]

Revision: 15120
          http://sourceforge.net/p/skim-app/code/15120
Author:   hofman
Date:     2025-04-12 16:04:53 +0000 (Sat, 12 Apr 2025)
Log Message:
-----------
Use correct method for validation

Modified Paths:
--------------
    trunk/SKMainToolbarController.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-12 15:53:57 UTC (rev 15119)
+++ trunk/SKMainToolbarController.m	2025-04-12 16:04:53 UTC (rev 15120)
@@ -1362,7 +1362,7 @@
     [backForwardButton setEnabled:[mainController.pdfView canGoForward] forSegment:1];
     NSArray *subitems = [(NSToolbarItemGroup *)[toolbarItems objectForKey:SKDocumentToolbarBackForwardItemIdentifier] subitems];
     [[subitems objectAtIndex:0] setEnabled:[mainController.pdfView canGoBack]];
-    [[subitems objectAtIndex:1] setEnabled:[mainController.pdfView canGoToFirstPage]];
+    [[subitems objectAtIndex:1] setEnabled:[mainController.pdfView canGoForward]];
 }
 
 - (void)handlePageChangedNotification:(NSNotification *)notification {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15119] trunk/SKMainToolbarController.m

[<ho...@us...>]

Revision: 15119
          http://sourceforge.net/p/skim-app/code/15119
Author:   hofman
Date:     2025-04-12 15:53:57 +0000 (Sat, 12 Apr 2025)
Log Message:
-----------
Enable/disable subitems of toolbar items. Only validate toolbar items in lable only mode when they bhave no submenu

Modified Paths:
--------------
    trunk/SKMainToolbarController.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-12 15:37:55 UTC (rev 15118)
+++ trunk/SKMainToolbarController.m	2025-04-12 15:53:57 UTC (rev 15119)
@@ -129,8 +129,10 @@
 - (void)validateVisibleItems {
     [super validateVisibleItems];
     if ([self displayMode] == NSToolbarDisplayModeLabelOnly && [[self delegate] respondsToSelector:@selector(validateToolbarItem:)]) {
-        for (NSToolbarItem *item in [self visibleItems])
-            [item setEnabled:[(id)[self delegate] validateToolbarItem:item]];
+        for (NSToolbarItem *item in [self visibleItems]) {
+            if ([[item menuFormRepresentation] hasSubmenu] == NO)
+                [item setEnabled:[(id)[self delegate] validateToolbarItem:item]];
+        }
     }
 }
 
@@ -221,8 +223,10 @@
             [item1 setLabels:NSLocalizedString(@"Previous", @"Toolbar item label")];
             menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Previous", @"Toolbar item label") action:@selector(doGoToPreviousPage:) target:mainController];
             [item1 setMenuFormRepresentation:menuItem];
+            [item1 setEnabled:[mainController.pdfView canGoToPreviousPage]];
             NSToolbarItem *item2 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
             [item2 setLabels:NSLocalizedString(@"Next", @"Toolbar item label")];
+            [item2 setEnabled:[mainController.pdfView canGoToNextPage]];
             [(NSToolbarItemGroup *)item setSubitems:@[item1, item2]];
             menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Next", @"Toolbar item label") action:@selector(doGoToNextPage:) target:mainController];
             [item2 setMenuFormRepresentation:menuItem];
@@ -295,10 +299,12 @@
             [item1 setLabels:NSLocalizedString(@"Back", @"Toolbar item label")];
             menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Back", @"Menu item title") action:@selector(doGoBack:) target:mainController];
             [item1 setMenuFormRepresentation:menuItem];
+            [item1 setEnabled:[mainController.pdfView canGoBack]];
             NSToolbarItem *item2 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
             [item2 setLabels:NSLocalizedString(@"Forward", @"Toolbar item label")];
             menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Forward", @"Menu item title") action:@selector(doGoForward:) target:mainController];
             [item2 setMenuFormRepresentation:menuItem];
+            [item2 setEnabled:[mainController.pdfView canGoForward]];
             [(NSToolbarItemGroup *)item setSubitems:@[item1, item2]];
             
         } else if ([identifier isEqualToString:SKDocumentToolbarPageNumberItemIdentifier]) {
@@ -1354,6 +1360,9 @@
 - (void)handleChangedHistoryNotification:(NSNotification *)notification {
     [backForwardButton setEnabled:[mainController.pdfView canGoBack] forSegment:0];
     [backForwardButton setEnabled:[mainController.pdfView canGoForward] forSegment:1];
+    NSArray *subitems = [(NSToolbarItemGroup *)[toolbarItems objectForKey:SKDocumentToolbarBackForwardItemIdentifier] subitems];
+    [[subitems objectAtIndex:0] setEnabled:[mainController.pdfView canGoBack]];
+    [[subitems objectAtIndex:1] setEnabled:[mainController.pdfView canGoToFirstPage]];
 }
 
 - (void)handlePageChangedNotification:(NSNotification *)notification {
@@ -1367,6 +1376,9 @@
     [previousNextFirstLastPageButton setEnabled:[mainController.pdfView canGoToPreviousPage] forSegment:1];
     [previousNextFirstLastPageButton setEnabled:[mainController.pdfView canGoToNextPage] forSegment:2];
     [previousNextFirstLastPageButton setEnabled:[mainController.pdfView canGoToLastPage] forSegment:3];
+    NSArray *subitems = [(NSToolbarItemGroup *)[toolbarItems objectForKey:SKDocumentToolbarPreviousNextItemIdentifier] subitems];
+    [[subitems objectAtIndex:0] setEnabled:[mainController.pdfView canGoToPreviousPage]];
+    [[subitems objectAtIndex:1] setEnabled:[mainController.pdfView canGoToNextPage]];
 }
 
 - (void)handleScaleChangedNotification:(NSNotification *)notification {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15118] trunk/SKMainToolbarContr oller.m

[<ho...@us...>]

Revision: 15118
          http://sourceforge.net/p/skim-app/code/15118
Author:   hofman
Date:     2025-04-12 15:37:55 +0000 (Sat, 12 Apr 2025)
Log Message:
-----------
Update note toolbar toolbar item tool tip

Modified Paths:
--------------
    trunk/SKMainToolbarController.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-12 09:30:53 UTC (rev 15117)
+++ trunk/SKMainToolbarController.m	2025-04-12 15:37:55 UTC (rev 15118)
@@ -1105,6 +1105,8 @@
 
 - (void)noteToolbarDidShowOrHide {
     [notesButton setSelected:[mainController hasNoteToolbar] forSegment:0];
+    NSToolbarItem *item = [toolbarItems objectForKey:SKDocumentToolbarNotesItemIdentifier];
+    [item setToolTip:[mainController hasNoteToolbar] ? NSLocalizedString(@"Hide Note Toolbar", @"Tool tip message") : NSLocalizedString(@"Show Note Toolbar", @"Tool tip message")];
 }
 
 - (void)updatePaneItemToolTips {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15117] trunk/SKMainToolbarContr oller.m

[<ho...@us...>]

Revision: 15117
          http://sourceforge.net/p/skim-app/code/15117
Author:   hofman
Date:     2025-04-12 09:30:53 +0000 (Sat, 12 Apr 2025)
Log Message:
-----------
validate visible items in label-only mode in main toolbar

Modified Paths:
--------------
    trunk/SKMainToolbarController.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-12 09:12:34 UTC (rev 15116)
+++ trunk/SKMainToolbarController.m	2025-04-12 09:30:53 UTC (rev 15117)
@@ -121,6 +121,23 @@
 
 #pragma mark -
 
+@interface SKToolbar : NSToolbar
+@end
+
+@implementation SKToolbar
+
+- (void)validateVisibleItems {
+    [super validateVisibleItems];
+    if ([self displayMode] == NSToolbarDisplayModeLabelOnly && [[self delegate] respondsToSelector:@selector(validateToolbarItem:)]) {
+        for (NSToolbarItem *item in [self visibleItems])
+            [item setEnabled:[(id)[self delegate] validateToolbarItem:item]];
+    }
+}
+
+@end
+
+#pragma mark -
+
 @interface SKMainToolbarController (SKPrivate)
 - (void)handleColorSwatchFrameChangedNotification:(NSNotification *)notification;
 - (void)updateColorsMenu:(NSMenu *)menu;
@@ -155,7 +172,7 @@
     [self view];
     
     // Create a new toolbar instance, and attach it to our document window
-    NSToolbar *toolbar = [[NSToolbar alloc] initWithIdentifier:SKDocumentToolbarIdentifier];
+    NSToolbar *toolbar = [[SKToolbar alloc] initWithIdentifier:SKDocumentToolbarIdentifier];
     
     // Set up toolbar properties: Allow customization, give a default display mode, and remember state in user defaults
     [toolbar setAllowsUserCustomization:YES];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15116] trunk/SKToolbarItem.m

[<ho...@us...>]

Revision: 15116
          http://sourceforge.net/p/skim-app/code/15116
Author:   hofman
Date:     2025-04-12 09:12:34 +0000 (Sat, 12 Apr 2025)
Log Message:
-----------
Don't use sizeToFit for toolbar items on 11.0+

Modified Paths:
--------------
    trunk/SKToolbarItem.m

Modified: trunk/SKToolbarItem.m
===================================================================
--- trunk/SKToolbarItem.m	2025-04-12 09:01:18 UTC (rev 15115)
+++ trunk/SKToolbarItem.m	2025-04-12 09:12:34 UTC (rev 15116)
@@ -71,8 +71,9 @@
 }
 
 - (void)setView:(NSView *)view {
-    if ([view isKindOfClass:[NSSegmentedControl class]] || [view isKindOfClass:[NSStepper class]]) {
-        [(NSSegmentedControl *)view sizeToFit];
+    if (@available(macOS 11.0, *)) {
+        if ([view isKindOfClass:[NSSegmentedControl class]] || [view isKindOfClass:[NSStepper class]])
+            [(NSControl *)view sizeToFit];
     }
     [super setView:view];
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15115] trunk/SKToolbarItem.m

[<ho...@us...>]

Revision: 15115
          http://sourceforge.net/p/skim-app/code/15115
Author:   hofman
Date:     2025-04-12 09:01:18 +0000 (Sat, 12 Apr 2025)
Log Message:
-----------
Don't use sizeToFit for toolbar items on 11.0+

Modified Paths:
--------------
    trunk/SKToolbarItem.m

Modified: trunk/SKToolbarItem.m
===================================================================
--- trunk/SKToolbarItem.m	2025-04-11 22:11:16 UTC (rev 15114)
+++ trunk/SKToolbarItem.m	2025-04-12 09:01:18 UTC (rev 15115)
@@ -50,8 +50,9 @@
 }
 
 - (void)setView:(NSView *)view {
-    if ([view isKindOfClass:[NSSegmentedControl class]] || [view isKindOfClass:[NSStepper class]]) {
-        [(NSSegmentedControl *)view sizeToFit];
+    if (@available(macOS 11.0, *)) {
+        if ([view isKindOfClass:[NSSegmentedControl class]] || [view isKindOfClass:[NSStepper class]])
+            [(NSControl *)view sizeToFit];
     }
     [super setView:view];
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15114] trunk/SKMainToolbarContr oller.m

[<ho...@us...>]

Revision: 15114
          http://sourceforge.net/p/skim-app/code/15114
Author:   hofman
Date:     2025-04-11 22:11:16 +0000 (Fri, 11 Apr 2025)
Log Message:
-----------
combine some cases

Modified Paths:
--------------
    trunk/SKMainToolbarController.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-11 14:41:33 UTC (rev 15113)
+++ trunk/SKMainToolbarController.m	2025-04-11 22:11:16 UTC (rev 15114)
@@ -969,7 +969,8 @@
         return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO && [mainController.pdfView autoScales] == NO;
     } else if ([identifier isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO && (NSIsEmptyRect([mainController.pdfView currentSelectionRect]) == NO || [mainController.pdfView toolMode] != SKToolModeSelect);
-    } else if ([identifier isEqualToString:SKDocumentToolbarZoomInOutItemIdentifier] ||
+    } else if ([identifier isEqualToString:SKDocumentToolbarZoomActualItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarZoomInOutItemIdentifier] ||
                [identifier isEqualToString:SKDocumentToolbarZoomInActualOutItemIdentifier] ||
                [identifier isEqualToString:SKDocumentToolbarAutoScalesItemIdentifier] ||
                [identifier isEqualToString:SKDocumentToolbarScaleItemIdentifier]) {
@@ -976,23 +977,33 @@
         return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO;
     } else if ([identifier isEqualToString:SKDocumentToolbarPageNumberItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO;
-    } else if ([identifier isEqualToString:SKDocumentToolbarDisplayBoxItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarDisplayModeItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarSingleTwoUpItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarContinuousItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarPageBreaksItemIdentifier]) {
+    } else if ([identifier isEqualToString:SKDocumentToolbarDisplayBoxItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarDisplayModeItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarSingleTwoUpItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarContinuousItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarPageBreaksItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarDisplaysRTLItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarBookModeItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO;
     } else if ([identifier isEqualToString:SKDocumentToolbarDisplayDirectionItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO && [mainController.pdfView displayMode] == kPDFDisplaySinglePageContinuous;
-    } else if ([identifier isEqualToString:SKDocumentToolbarDisplaysRTLItemIdentifier]) {
-        return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO;
-    } else if ([identifier isEqualToString:SKDocumentToolbarBookModeItemIdentifier]) {
-        return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO;
     } else if ([identifier isEqualToString:SKDocumentToolbarToolModeItemIdentifier]) {
         return [mainController hasOverview] == NO;
-    } else if ([identifier isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewLineItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewLineItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarNewNoteItemIdentifier]) {
+    } else if ([identifier isEqualToString:SKDocumentToolbarNewTextNoteItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarNewCircleNoteItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarNewLineItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarNewMarkupItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarNewLineItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarNewNoteItemIdentifier]) {
         return [mainController hasOverview] == NO && [mainController.pdfView canSelectNote];
     } else if ([identifier isEqualToString:SKDocumentToolbarFullScreenItemIdentifier]) {
         return [mainController canEnterFullscreen] || [mainController canExitFullscreen];
     } else if ([identifier isEqualToString:SKDocumentToolbarPresentationItemIdentifier]) {
         return [mainController canEnterPresentation] || [mainController canExitPresentation];
-    } else if ([identifier isEqualToString:SKDocumentToolbarRotateRightItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarRotateLeftItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarRotateLeftRightItemIdentifier] || [identifier isEqualToString:SKDocumentToolbarCropItemIdentifier]) {
+    } else if ([identifier isEqualToString:SKDocumentToolbarRotateRightItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarRotateLeftItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarRotateLeftRightItemIdentifier] ||
+               [identifier isEqualToString:SKDocumentToolbarCropItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO;
     } else if ([identifier isEqualToString:NSToolbarPrintItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15113] trunk/SKMainToolbarContr oller.m

[<ho...@us...>]

Revision: 15113
          http://sourceforge.net/p/skim-app/code/15113
Author:   hofman
Date:     2025-04-11 14:41:33 +0000 (Fri, 11 Apr 2025)
Log Message:
-----------
Don't disable zoom actual toolbar item, it can zoom to physical size

Modified Paths:
--------------
    trunk/SKMainToolbarController.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-11 13:58:33 UTC (rev 15112)
+++ trunk/SKMainToolbarController.m	2025-04-11 14:41:33 UTC (rev 15113)
@@ -964,7 +964,7 @@
     NSString *identifier = [toolbarItem itemIdentifier];
     
     if ([identifier isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
-        return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO && ([mainController.pdfView  autoScales] || fabs([mainController.pdfView scaleFactor] - 1.0) > 0.0);
+        return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO;
     } else if ([identifier isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO && [mainController.pdfView autoScales] == NO;
     } else if ([identifier isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15112] trunk/SKMainWindowController.m

[<ho...@us...>]

Revision: 15112
          http://sourceforge.net/p/skim-app/code/15112
Author:   hofman
Date:     2025-04-11 13:58:33 +0000 (Fri, 11 Apr 2025)
Log Message:
-----------
rename SKToolbarPlacement to SKTitleAndToolbarStyle

Modified Paths:
--------------
    trunk/SKMainWindowController.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2025-04-11 09:25:16 UTC (rev 15111)
+++ trunk/SKMainWindowController.m	2025-04-11 13:58:33 UTC (rev 15112)
@@ -185,7 +185,7 @@
 
 #define SKDisableSearchBarBlurringKey @"SKDisableSearchBarBlurring"
 
-#define SKToolbarPlacementKey @"SKToolbarPlacement"
+#define SKTitleAndToolbarStyleKey @"SKTitleAndToolbarStyle"
 
 #pragma mark -    
 
@@ -330,7 +330,7 @@
     enum { SKTBCompact = 1<<0, SKTBBesideTitle = 1<<1, SKTBReplacingTitle = 1<<2};
     // hidden pref for toolbar position relative to title, 0-7
     // SKTBBesideTitle | SKTBReplacingTitle = tab bar replacing title
-    NSInteger placement = [[NSUserDefaults standardUserDefaults] integerForKey:SKToolbarPlacementKey];
+    NSInteger placement = [[NSUserDefaults standardUserDefaults] integerForKey:SKTitleAndToolbarStyleKey];
     if (@available(macOS 11.0, *))
         [window setToolbarStyle:placement <= SKTBCompact ? NSWindowToolbarStyleExpanded : (placement & SKTBCompact) ? NSWindowToolbarStyleUnifiedCompact : NSWindowToolbarStyleUnified];
     

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15111] trunk

[<ho...@us...>]

Revision: 15111
          http://sourceforge.net/p/skim-app/code/15111
Author:   hofman
Date:     2025-04-11 09:25:16 +0000 (Fri, 11 Apr 2025)
Log Message:
-----------
There should be no need to invalidate toolbar items when running customization palette

Modified Paths:
--------------
    trunk/SKMainToolbarController.m
    trunk/SKNotesDocument.m

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-10 17:28:07 UTC (rev 15110)
+++ trunk/SKMainToolbarController.m	2025-04-11 09:25:16 UTC (rev 15111)
@@ -963,9 +963,7 @@
 - (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
     NSString *identifier = [toolbarItem itemIdentifier];
     
-    if ([[toolbarItem toolbar] customizationPaletteIsRunning]) {
-        return NO;
-    } else if ([identifier isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
+    if ([identifier isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO && ([mainController.pdfView  autoScales] || fabs([mainController.pdfView scaleFactor] - 1.0) > 0.0);
     } else if ([identifier isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
         return [mainController.pdfView.document isLocked] == NO && [mainController hasOverview] == NO && [mainController.pdfView autoScales] == NO;

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m	2025-04-10 17:28:07 UTC (rev 15110)
+++ trunk/SKNotesDocument.m	2025-04-11 09:25:16 UTC (rev 15111)
@@ -951,9 +951,7 @@
 }
 
 - (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {
-    if ([[[self window] toolbar] customizationPaletteIsRunning])
-        return NO;
-    else if ([[toolbarItem itemIdentifier] isEqualToString:SKNotesDocumentOpenPDFToolbarItemIdentifier])
+    if ([[toolbarItem itemIdentifier] isEqualToString:SKNotesDocumentOpenPDFToolbarItemIdentifier])
         return [(sourceFileURL ?: [[self fileURL] URLReplacingPathExtension:@"pdf"]) checkResourceIsReachableAndReturnError:NULL];
     return YES;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15110] trunk/SKNoteToolbarContr oller.m

[<ho...@us...>]

Revision: 15110
          http://sourceforge.net/p/skim-app/code/15110
Author:   hofman
Date:     2025-04-10 17:28:07 +0000 (Thu, 10 Apr 2025)
Log Message:
-----------
Movee fonts button to end of notes toolbar, as it is only used for text notes

Modified Paths:
--------------
    trunk/SKNoteToolbarController.m

Modified: trunk/SKNoteToolbarController.m
===================================================================
--- trunk/SKNoteToolbarController.m	2025-04-10 16:46:15 UTC (rev 15109)
+++ trunk/SKNoteToolbarController.m	2025-04-10 17:28:07 UTC (rev 15110)
@@ -97,15 +97,6 @@
     [self updateColorsMenu];
     [[NSUserDefaults standardUserDefaults] addObserver:self forKeyPath:SKSwatchColorsKey options:0 context:&SKDefaultsObservationContext];
     
-    fontsButton = [NSSegmentedControl segmentedControlWithImages:@[[NSImage imageNamed:SKImageNameToolbarFonts]] trackingMode:NSSegmentSwitchTrackingMomentary target:nil action:@selector(orderFrontFontPanel:)];
-    [fontsButton setHelp:NSLocalizedString(@"Fonts", @"Tool tip message") forSegment:0];
-    [fontsButton setTranslatesAutoresizingMaskIntoConstraints:NO];
-    menu = [NSMenu menu];
-    for (NSInteger i = 9; i < 19; i++) {
-        [menu addItemWithTitle:[NSString stringWithFormat:@"%ld", (long)i] action:@selector(selectFontSize:) target:self tag:i];
-    }
-    [fontsButton setMenu:menu forSegment:0];
-    
     linesButton = [NSSegmentedControl segmentedControlWithImages:@[[NSImage imageNamed:SKImageNameToolbarLines]] trackingMode:NSSegmentSwitchTrackingMomentary target:nil action:@selector(orderFrontLineInspector:)];
     [linesButton setHelp:NSLocalizedString(@"Lines", @"Tool tip message") forSegment:0];
     [linesButton setTranslatesAutoresizingMaskIntoConstraints:NO];
@@ -128,6 +119,15 @@
     }
     [linesButton setMenu:menu forSegment:0];
     
+    fontsButton = [NSSegmentedControl segmentedControlWithImages:@[[NSImage imageNamed:SKImageNameToolbarFonts]] trackingMode:NSSegmentSwitchTrackingMomentary target:nil action:@selector(orderFrontFontPanel:)];
+    [fontsButton setHelp:NSLocalizedString(@"Fonts", @"Tool tip message") forSegment:0];
+    [fontsButton setTranslatesAutoresizingMaskIntoConstraints:NO];
+    menu = [NSMenu menu];
+    for (NSInteger i = 9; i < 19; i++) {
+        [menu addItemWithTitle:[NSString stringWithFormat:@"%ld", (long)i] action:@selector(selectFontSize:) target:self tag:i];
+    }
+    [fontsButton setMenu:menu forSegment:0];
+    
     [self validateButtons];
     
     NSView *view = [[NSView alloc] init];
@@ -141,10 +141,10 @@
         [[noteButton centerYAnchor] constraintEqualToAnchor:[view centerYAnchor]],
         [[colorsButton leadingAnchor] constraintEqualToAnchor:[noteButton trailingAnchor] constant:20.0],
         [[colorsButton centerYAnchor] constraintEqualToAnchor:[noteButton centerYAnchor]],
-        [[fontsButton leadingAnchor] constraintEqualToAnchor:[colorsButton trailingAnchor] constant:8.0],
-        [[fontsButton centerYAnchor] constraintEqualToAnchor:[noteButton centerYAnchor]],
-        [[linesButton leadingAnchor] constraintEqualToAnchor:[fontsButton trailingAnchor] constant:8.0],
-        [[linesButton centerYAnchor] constraintEqualToAnchor:[noteButton centerYAnchor]]
+        [[linesButton leadingAnchor] constraintEqualToAnchor:[colorsButton trailingAnchor] constant:8.0],
+        [[linesButton centerYAnchor] constraintEqualToAnchor:[noteButton centerYAnchor]],
+        [[fontsButton leadingAnchor] constraintEqualToAnchor:[linesButton trailingAnchor] constant:8.0],
+        [[fontsButton centerYAnchor] constraintEqualToAnchor:[noteButton centerYAnchor]]
     ];
     [NSLayoutConstraint activateConstraints:constraints];
     

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15109] trunk

[<ho...@us...>]

Revision: 15109
          http://sourceforge.net/p/skim-app/code/15109
Author:   hofman
Date:     2025-04-10 16:46:15 +0000 (Thu, 10 Apr 2025)
Log Message:
-----------
Group toolbar items with subitems for previous/next and back/forward toolbar items. Use also separate menu for representations.

Modified Paths:
--------------
    trunk/SKMainToolbarController.m
    trunk/SKToolbarItem.h
    trunk/SKToolbarItem.m
    trunk/de.lproj/Localizable.strings
    trunk/en.lproj/Localizable.strings
    trunk/es.lproj/Localizable.strings
    trunk/fr.lproj/Localizable.strings
    trunk/it.lproj/Localizable.strings
    trunk/ja.lproj/Localizable.strings
    trunk/nl.lproj/Localizable.strings
    trunk/pl.lproj/Localizable.strings
    trunk/ru.lproj/Localizable.strings
    trunk/zh_CN.lproj/Localizable.strings
    trunk/zh_TW.lproj/Localizable.strings

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-10 08:57:35 UTC (rev 15108)
+++ trunk/SKMainToolbarController.m	2025-04-10 16:46:15 UTC (rev 15109)
@@ -105,9 +105,6 @@
 #define SKDocumentToolbarColorSwatchItemIdentifier @"SKDocumentToolbarColorSwatchItemIdentifier"
 #define SKDocumentToolbarShareItemIdentifier @"SKDocumentToolbarShareItemIdentifier"
 #define SKDocumentToolbarPacerItemIdentifier @"SKDocumentToolbarPacerItemIdentifier"
-#define SKDocumentToolbarPacerButtonItemIdentifier @"SKDocumentToolbarPacerButtonItemIdentifier"
-#define SKDocumentToolbarPacerSpeedFieldItemIdentifier @"SKDocumentToolbarPacerSpeedFieldItemIdentifier"
-#define SKDocumentToolbarPacerSpeedStepperItemIdentifier @"SKDocumentToolbarPacerSpeedStepperItemIdentifier"
 #define SKDocumentToolbarColorsItemIdentifier @"SKDocumentToolbarColorsItemIdentifier"
 #define SKDocumentToolbarFontsItemIdentifier @"SKDocumentToolbarFontsItemIdentifier"
 #define SKDocumentToolbarLinesItemIdentifier @"SKDocumentToolbarLinesItemIdentifier"
@@ -184,25 +181,35 @@
         
         if (toolbarItems == nil)
             toolbarItems = [[NSMutableDictionary alloc] init];
-
-        item = [[SKToolbarItem alloc] initWithItemIdentifier:identifier];
+        
+        static NSSet *groupIdentifiers = nil;
+        if (groupIdentifiers == nil)
+            groupIdentifiers = [NSSet setWithObjects:SKDocumentToolbarPreviousNextItemIdentifier, SKDocumentToolbarPreviousNextFirstLastItemIdentifier, SKDocumentToolbarBackForwardItemIdentifier, SKDocumentToolbarPacerItemIdentifier, nil];
+        
+        if ([groupIdentifiers containsObject:identifier])
+            item = [[SKToolbarItemGroup alloc] initWithItemIdentifier:identifier];
+        else
+            item = [[SKToolbarItem alloc] initWithItemIdentifier:identifier];
         [toolbarItems setObject:item forKey:identifier];
     
         if ([identifier isEqualToString:SKDocumentToolbarPreviousNextItemIdentifier]) {
             
-            menuItem = [[NSMenuItem alloc] initWithSubmenuAndTitle:NSLocalizedString(@"Previous/Next", @"Toolbar item label")];
-            menu = [menuItem submenu];
-            [menu addItemWithTitle:NSLocalizedString(@"Previous", @"Menu item title") action:@selector(doGoToPreviousPage:) target:mainController];
-            [menu addItemWithTitle:NSLocalizedString(@"Next", @"Menu item title") action:@selector(doGoToNextPage:) target:mainController];
-            
-            [item setLabels:NSLocalizedString(@"Previous/Next", @"Toolbar item label")];
             [item setToolTip:NSLocalizedString(@"Previous/Next", @"Tool tip message")];
             [previousNextPageButton setHelp:NSLocalizedString(@"Go To Previous Page", @"Tool tip message") forSegment:0];
             [previousNextPageButton setHelp:NSLocalizedString(@"Go To Next Page", @"Tool tip message") forSegment:1];
             [previousNextPageButton setSegmentStyle:NSSegmentStyleSeparated];
             [item setView:previousNextPageButton];
-            [item setMenuFormRepresentation:menuItem];
             
+            NSToolbarItem *item1 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
+            [item1 setLabels:NSLocalizedString(@"Previous", @"Toolbar item label")];
+            menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Previous", @"Toolbar item label") action:@selector(doGoToPreviousPage:) target:mainController];
+            [item1 setMenuFormRepresentation:menuItem];
+            NSToolbarItem *item2 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
+            [item2 setLabels:NSLocalizedString(@"Next", @"Toolbar item label")];
+            [(NSToolbarItemGroup *)item setSubitems:@[item1, item2]];
+            menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Next", @"Toolbar item label") action:@selector(doGoToNextPage:) target:mainController];
+            [item2 setMenuFormRepresentation:menuItem];
+            
         } else if ([identifier isEqualToString:SKDocumentToolbarPreviousItemIdentifier]) {
             
             menuItem = [[NSMenuItem alloc] initWithSubmenuAndTitle:NSLocalizedString(@"Previous", @"Toolbar item label")];
@@ -242,7 +249,6 @@
             [menu addItemWithTitle:NSLocalizedString(@"First", @"Menu item title") action:@selector(doGoToFirstPage:) target:mainController];
             [menu addItemWithTitle:NSLocalizedString(@"Last", @"Menu item title") action:@selector(doGoToLastPage:) target:mainController];
             
-            [item setLabels:NSLocalizedString(@"Previous/Next", @"Toolbar item label")];
             [item setToolTip:NSLocalizedString(@"Go To First, Previous, Next or Last Page", @"Tool tip message")];
             [previousNextFirstLastPageButton setHelp:NSLocalizedString(@"Go To First page", @"Tool tip message") forSegment:0];
             [previousNextFirstLastPageButton setHelp:NSLocalizedString(@"Go To Previous Page", @"Tool tip message") forSegment:1];
@@ -252,21 +258,32 @@
             [item setView:previousNextFirstLastPageButton];
             [item setMenuFormRepresentation:menuItem];
             
+            NSToolbarItem *item1 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
+            NSToolbarItem *item2 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
+            [item2 setLabels:NSLocalizedString(@"Previous", @"Toolbar item label")];
+            NSToolbarItem *item3 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
+            [item3 setLabels:NSLocalizedString(@"Next", @"Toolbar item label")];
+            NSToolbarItem *item4 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
+            [(NSToolbarItemGroup *)item setSubitems:@[item1, item2, item3, item4]];
+            
         } else if ([identifier isEqualToString:SKDocumentToolbarBackForwardItemIdentifier]) {
             
-            menuItem = [[NSMenuItem alloc] initWithSubmenuAndTitle:NSLocalizedString(@"Back/Forward", @"Toolbar item label")];
-            menu = [menuItem submenu];
-            [menu addItemWithTitle:NSLocalizedString(@"Back", @"Menu item title") action:@selector(doGoBack:) target:mainController];
-            [menu addItemWithTitle:NSLocalizedString(@"Forward", @"Menu item title") action:@selector(doGoForward:) target:mainController];
-            
-            [item setLabels:NSLocalizedString(@"Back/Forward", @"Toolbar item label")];
             [item setToolTip:NSLocalizedString(@"Back/Forward", @"Tool tip message")];
             [backForwardButton setHelp:NSLocalizedString(@"Go Back", @"Tool tip message") forSegment:0];
             [backForwardButton setHelp:NSLocalizedString(@"Go Forward", @"Tool tip message") forSegment:1];
             [backForwardButton setSegmentStyle:NSSegmentStyleSeparated];
             [item setView:backForwardButton];
-            [item setMenuFormRepresentation:menuItem];
             
+            NSToolbarItem *item1 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
+            [item1 setLabels:NSLocalizedString(@"Back", @"Toolbar item label")];
+            menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Back", @"Menu item title") action:@selector(doGoBack:) target:mainController];
+            [item1 setMenuFormRepresentation:menuItem];
+            NSToolbarItem *item2 = [[NSToolbarItem alloc] initWithItemIdentifier:@""];
+            [item2 setLabels:NSLocalizedString(@"Forward", @"Toolbar item label")];
+            menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Forward", @"Menu item title") action:@selector(doGoForward:) target:mainController];
+            [item2 setMenuFormRepresentation:menuItem];
+            [(NSToolbarItemGroup *)item setSubitems:@[item1, item2]];
+            
         } else if ([identifier isEqualToString:SKDocumentToolbarPageNumberItemIdentifier]) {
             
             menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Page", @"Menu item title") action:@selector(doGoToPage:) target:mainController];
@@ -720,10 +737,6 @@
             
         } else if ([identifier isEqualToString:SKDocumentToolbarPacerItemIdentifier]) {
             
-            NSToolbarItemGroup *group = [[NSToolbarItemGroup alloc] initWithItemIdentifier:identifier];
-            [toolbarItems setObject:group forKey:identifier];
-            item = (id)group;
-            
             [pacerButton sizeToFit];
             NSRect frame;
             frame = [pacerButton frame];
@@ -753,13 +766,13 @@
             [pacerSpeedStepper setToolTip:NSLocalizedString(@"Pacer Speed", @"Tool tip message")];
             [item setMenuFormRepresentation:menuItem];
             
-            NSToolbarItem *item1 = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarPacerButtonItemIdentifier];
+            NSToolbarItem *item1 = [[SKToolbarItem alloc] initWithItemIdentifier:@""];
             [item1 setView:pacerButton];
-            NSToolbarItem *item2 = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarPacerSpeedFieldItemIdentifier];
+            NSToolbarItem *item2 = [[SKToolbarItem alloc] initWithItemIdentifier:@""];
             [item2 setView:pacerSpeedField];
-            NSToolbarItem *item3 = [[SKToolbarItem alloc] initWithItemIdentifier:SKDocumentToolbarPacerSpeedStepperItemIdentifier];
+            NSToolbarItem *item3 = [[SKToolbarItem alloc] initWithItemIdentifier:@""];
             [item3 setView:pacerSpeedStepper];
-            [group setSubitems:@[item1, item2, item3]];
+            [(NSToolbarItemGroup *)item setSubitems:@[item1, item2, item3]];
             
         } else if ([identifier isEqualToString:SKDocumentToolbarColorsItemIdentifier]) {
             

Modified: trunk/SKToolbarItem.h
===================================================================
--- trunk/SKToolbarItem.h	2025-04-10 08:57:35 UTC (rev 15108)
+++ trunk/SKToolbarItem.h	2025-04-10 16:46:15 UTC (rev 15109)
@@ -41,3 +41,7 @@
 
 @interface SKToolbarItem : NSToolbarItem
 @end
+
+
+@interface SKToolbarItemGroup : NSToolbarItemGroup
+@end

Modified: trunk/SKToolbarItem.m
===================================================================
--- trunk/SKToolbarItem.m	2025-04-10 08:57:35 UTC (rev 15108)
+++ trunk/SKToolbarItem.m	2025-04-10 16:46:15 UTC (rev 15109)
@@ -57,3 +57,23 @@
 }
 
 @end
+
+
+@implementation SKToolbarItemGroup
+
+- (void)validate {
+    if ([self view] && [[[self toolbar] delegate] respondsToSelector:@selector(validateToolbarItem:)]) {
+        BOOL enabled = [(id)[[self toolbar] delegate] validateToolbarItem:self];
+        [self setEnabled:enabled];
+    }
+    [super validate];
+}
+
+- (void)setView:(NSView *)view {
+    if ([view isKindOfClass:[NSSegmentedControl class]] || [view isKindOfClass:[NSStepper class]]) {
+        [(NSSegmentedControl *)view sizeToFit];
+    }
+    [super setView:view];
+}
+
+@end

Modified: trunk/de.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/en.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/es.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/fr.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/it.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ja.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/nl.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/pl.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ru.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/zh_CN.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/zh_TW.lproj/Localizable.strings
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15108] trunk

[<ho...@us...>]

Revision: 15108
          http://sourceforge.net/p/skim-app/code/15108
Author:   hofman
Date:     2025-04-10 08:57:35 +0000 (Thu, 10 Apr 2025)
Log Message:
-----------
Remove Customize toolbar item

Modified Paths:
--------------
    trunk/MainToolbar.xib
    trunk/NSImage_SKExtensions.h
    trunk/NSImage_SKExtensions.m
    trunk/SKMainToolbarController.h
    trunk/SKMainToolbarController.m
    trunk/de.lproj/Localizable.strings
    trunk/en.lproj/Localizable.strings
    trunk/es.lproj/Localizable.strings
    trunk/fr.lproj/Localizable.strings
    trunk/it.lproj/Localizable.strings
    trunk/ja.lproj/Localizable.strings
    trunk/nl.lproj/Localizable.strings
    trunk/pl.lproj/Localizable.strings
    trunk/ru.lproj/Localizable.strings
    trunk/zh_CN.lproj/Localizable.strings
    trunk/zh_TW.lproj/Localizable.strings

Modified: trunk/MainToolbar.xib
===================================================================
--- trunk/MainToolbar.xib	2025-04-09 15:39:20 UTC (rev 15107)
+++ trunk/MainToolbar.xib	2025-04-10 08:57:35 UTC (rev 15108)
@@ -16,7 +16,6 @@
                 <outlet property="colorsButton" destination="14" id="92"/>
                 <outlet property="continuousButton" destination="3" id="115"/>
                 <outlet property="cropButton" destination="22" id="108"/>
-                <outlet property="customizeButton" destination="16" id="96"/>
                 <outlet property="displayBoxButton" destination="11" id="113"/>
                 <outlet property="displayDirectionButton" destination="1gC-QY-jJv" id="mJs-fl-IFE"/>
                 <outlet property="displayModeButton" destination="4" id="116"/>
@@ -244,19 +243,6 @@
                         <action selector="printDocument:" target="-1" id="124"/>
                     </connections>
                 </segmentedControl>
-                <segmentedControl verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="16">
-                    <rect key="frame" x="206" y="129" width="29" height="25"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <segmentedCell key="cell" borderStyle="border" alignment="left" segmentDistribution="fill" style="texturedSquare" trackingMode="momentary" id="63">
-                        <font key="font" metaFont="system"/>
-                        <segments>
-                            <segment image="ToolbarCustomize" imageScaling="none" width="27"/>
-                        </segments>
-                    </segmentedCell>
-                    <connections>
-                        <action selector="runToolbarCustomizationPalette:" target="-1" id="125"/>
-                    </connections>
-                </segmentedControl>
                 <segmentedControl verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="17">
                     <rect key="frame" x="20" y="129" width="29" height="25"/>
                     <autoresizingMask key="autoresizingMask"/>
@@ -761,7 +747,6 @@
         <image name="ToolbarColors" width="27" height="20"/>
         <image name="ToolbarCrop" width="128" height="128"/>
         <image name="ToolbarCropBox" width="128" height="128"/>
-        <image name="ToolbarCustomize" width="27" height="19"/>
         <image name="ToolbarFirstPage" width="128" height="128"/>
         <image name="ToolbarFonts" width="27" height="20"/>
         <image name="ToolbarForward" width="128" height="128"/>

Modified: trunk/NSImage_SKExtensions.h
===================================================================
--- trunk/NSImage_SKExtensions.h	2025-04-09 15:39:20 UTC (rev 15107)
+++ trunk/NSImage_SKExtensions.h	2025-04-10 08:57:35 UTC (rev 15108)
@@ -122,7 +122,6 @@
 extern NSString *SKImageNameToolbarFonts;
 extern NSString *SKImageNameToolbarLines;
 extern NSString *SKImageNameToolbarPrint;
-extern NSString *SKImageNameToolbarCustomize;
 
 extern NSString *SKImageNameTouchBarPageUp;
 extern NSString *SKImageNameTouchBarPageDown;

Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m	2025-04-09 15:39:20 UTC (rev 15107)
+++ trunk/NSImage_SKExtensions.m	2025-04-10 08:57:35 UTC (rev 15108)
@@ -126,7 +126,6 @@
 NSString *SKImageNameToolbarFonts = @"ToolbarFonts";
 NSString *SKImageNameToolbarLines = @"ToolbarLines";
 NSString *SKImageNameToolbarPrint = @"ToolbarPrint";
-NSString *SKImageNameToolbarCustomize = @"ToolbarCustomize";
 
 NSString *SKImageNameTouchBarPageUp = @"TouchBarPageUp";
 NSString *SKImageNameTouchBarPageDown = @"TouchBarPageDown";
@@ -955,14 +954,7 @@
         [path fill];
     );
     
-    MAKE_IMAGE(SKImageNameToolbarCustomize, YES, 27.0, 20.0,
-        [[NSColor blackColor] setFill];
-        [NSBezierPath fillRect:NSMakeRect(4.0, 1.0, 19.0, 19.0)];
-        NSImage *customizeImage = [[NSWorkspace sharedWorkspace] iconForFileType:NSFileTypeForHFSTypeCode(kToolbarCustomizeIcon)];
-        [customizeImage drawInRect:NSMakeRect(4.0, 1.0, 19.0, 19.0) fromRect:NSZeroRect operation:NSCompositingOperationDestinationAtop fraction:1.0];
-    );
-    
-    MAKE_IMAGE(SKImageNameToolbarPrint, YES, 27.0, 20.0, 
+    MAKE_IMAGE(SKImageNameToolbarPrint, YES, 27.0, 20.0,
         NSImage *img = nil;
         if (@available(macOS 11.0, *))
             img = [NSImage imageWithSystemSymbolName:@"printer" accessibilityDescription:nil];

Modified: trunk/SKMainToolbarController.h
===================================================================
--- trunk/SKMainToolbarController.h	2025-04-09 15:39:20 UTC (rev 15107)
+++ trunk/SKMainToolbarController.h	2025-04-10 08:57:35 UTC (rev 15108)
@@ -83,7 +83,6 @@
     NSSegmentedControl *fontsButton;
     NSSegmentedControl *linesButton;
     NSSegmentedControl *printButton;
-    NSSegmentedControl *customizeButton;
     NSTextField *scaleField;
     NSSegmentedControl *noteButton;
     NSSegmentedControl *notesButton;
@@ -97,7 +96,7 @@
 }
 
 @property (nonatomic, nullable, weak) IBOutlet SKMainWindowController *mainController;
-@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl *backForwardButton, *previousNextPageButton, *previousPageButton, *nextPageButton, *previousNextFirstLastPageButton, *zoomInOutButton, *zoomInActualOutButton, *zoomActualButton, *zoomFitButton, *zoomSelectionButton, *autoScalesButton, *rotateLeftButton, *rotateRightButton, *rotateLeftRightButton, *cropButton, *fullScreenButton, *presentationButton, *leftPaneButton, *rightPaneButton, *splitPDFButton, *toolModeButton, *textNoteButton, *circleNoteButton, *markupNoteButton, *lineNoteButton, *singleTwoUpButton, *continuousButton, *displayModeButton, *displayDirectionButton, *displaysRTLButton, *bookModeButton, *pageBreaksButton, *displayBoxButton, *infoButton, *colorsButton, *fontsButton, *linesButton, *printButton, *customizeButton, *noteButton, *notesButton, *pacerButton, *shareButton;
+@property (nonatomic, nullable, strong) IBOutlet NSSegmentedControl *backForwardButton, *previousNextPageButton, *previousPageButton, *nextPageButton, *previousNextFirstLastPageButton, *zoomInOutButton, *zoomInActualOutButton, *zoomActualButton, *zoomFitButton, *zoomSelectionButton, *autoScalesButton, *rotateLeftButton, *rotateRightButton, *rotateLeftRightButton, *cropButton, *fullScreenButton, *presentationButton, *leftPaneButton, *rightPaneButton, *splitPDFButton, *toolModeButton, *textNoteButton, *circleNoteButton, *markupNoteButton, *lineNoteButton, *singleTwoUpButton, *continuousButton, *displayModeButton, *displayDirectionButton, *displaysRTLButton, *bookModeButton, *pageBreaksButton, *displayBoxButton, *infoButton, *colorsButton, *fontsButton, *linesButton, *printButton, *noteButton, *notesButton, *pacerButton, *shareButton;
 @property (nonatomic, nullable, strong) IBOutlet NSTextField *pageNumberField, *scaleField, *pacerSpeedField;
 @property (nonatomic, nullable, strong) IBOutlet SKColorSwatch *colorSwatch;
 @property (nonatomic, nullable, strong) IBOutlet NSStepper *pacerSpeedStepper;

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-09 15:39:20 UTC (rev 15107)
+++ trunk/SKMainToolbarController.m	2025-04-10 08:57:35 UTC (rev 15108)
@@ -115,7 +115,6 @@
 #define SKDocumentToolbarNotesPaneItemIdentifier @"SKDocumentToolbarNotesPaneItemIdentifier"
 #define SKDocumentToolbarSplitPDFItemIdentifier @"SKDocumentToolbarSplitPDFItemIdentifier"
 #define SKDocumentToolbarPrintItemIdentifier @"SKDocumentToolbarPrintItemIdentifier"
-#define SKDocumentToolbarCustomizeItemIdentifier @"SKDocumentToolbarCustomizeItemIdentifier"
 
 static NSString *noteToolImageNames[] = {@"ToolbarTextNoteMenu", @"ToolbarAnchoredNoteMenu", @"ToolbarCircleNoteMenu", @"ToolbarSquareNoteMenu", @"ToolbarHighlightNoteMenu", @"ToolbarUnderlineNoteMenu", @"ToolbarStrikeOutNoteMenu", @"ToolbarLineNoteMenu", @"ToolbarInkNoteMenu"};
 
@@ -135,7 +134,7 @@
 
 @implementation SKMainToolbarController
 
-@synthesize mainController, backForwardButton, pageNumberField, previousNextPageButton, previousPageButton, nextPageButton, previousNextFirstLastPageButton, zoomInOutButton, zoomInActualOutButton, zoomActualButton, zoomFitButton, zoomSelectionButton, autoScalesButton, rotateLeftButton, rotateRightButton, rotateLeftRightButton, cropButton, fullScreenButton, presentationButton, leftPaneButton, rightPaneButton, splitPDFButton, toolModeButton, textNoteButton, circleNoteButton, markupNoteButton, lineNoteButton, singleTwoUpButton, continuousButton, displayModeButton, displayDirectionButton, displaysRTLButton, bookModeButton, pageBreaksButton, displayBoxButton, infoButton, colorsButton, fontsButton, linesButton, printButton, customizeButton, scaleField, noteButton, notesButton, colorSwatch, pacerButton, pacerSpeedField, pacerSpeedStepper, shareButton;
+@synthesize mainController, backForwardButton, pageNumberField, previousNextPageButton, previousPageButton, nextPageButton, previousNextFirstLastPageButton, zoomInOutButton, zoomInActualOutButton, zoomActualButton, zoomFitButton, zoomSelectionButton, autoScalesButton, rotateLeftButton, rotateRightButton, rotateLeftRightButton, cropButton, fullScreenButton, presentationButton, leftPaneButton, rightPaneButton, splitPDFButton, toolModeButton, textNoteButton, circleNoteButton, markupNoteButton, lineNoteButton, singleTwoUpButton, continuousButton, displayModeButton, displayDirectionButton, displaysRTLButton, bookModeButton, pageBreaksButton, displayBoxButton, infoButton, colorsButton, fontsButton, linesButton, printButton, scaleField, noteButton, notesButton, colorSwatch, pacerButton, pacerSpeedField, pacerSpeedStepper, shareButton;
 
 - (void)dealloc {
     @try { [[NSUserDefaults standardUserDefaults] removeObserver:self forKeyPath:SKSwatchColorsKey context:&SKDefaultsObservationContext]; }
@@ -863,15 +862,6 @@
             [item setView:printButton];
             [item setMenuFormRepresentation:menuItem];
             
-        } else if ([identifier isEqualToString:SKDocumentToolbarCustomizeItemIdentifier]) {
-            
-            menuItem = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Customize", @"Menu item title") action:@selector(runToolbarCustomizationPalette:) target:nil];
-            
-            [item setLabels:NSLocalizedString(@"Customize", @"Toolbar item label")];
-            [item setToolTip:NSLocalizedString(@"Customize Toolbar", @"Tool tip message")];
-            [item setView:customizeButton];
-            [item setMenuFormRepresentation:menuItem];
-            
         }
     }
     
@@ -954,8 +944,7 @@
         SKDocumentToolbarPrintItemIdentifier,
         NSToolbarFlexibleSpaceItemIdentifier,
         NSToolbarSpaceItemIdentifier,
-        NSToolbarSeparatorItemIdentifier,
-        SKDocumentToolbarCustomizeItemIdentifier];
+        NSToolbarSeparatorItemIdentifier];
 }
 
 - (BOOL)validateToolbarItem:(NSToolbarItem *)toolbarItem {

Modified: trunk/de.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/en.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/es.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/fr.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/it.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ja.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/nl.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/pl.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ru.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/zh_CN.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/zh_TW.lproj/Localizable.strings
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15107] trunk/NSImage_SKExtens ions.m

[<ho...@us...>]

Revision: 15107
          http://sourceforge.net/p/skim-app/code/15107
Author:   hofman
Date:     2025-04-09 15:39:20 +0000 (Wed, 09 Apr 2025)
Log Message:
-----------
Some more SF Symbols

Modified Paths:
--------------
    trunk/NSImage_SKExtensions.m

Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m	2025-04-09 09:36:17 UTC (rev 15106)
+++ trunk/NSImage_SKExtensions.m	2025-04-09 15:39:20 UTC (rev 15107)
@@ -869,23 +869,30 @@
     );
     
     MAKE_IMAGE(SKImageNameToolbarShare, YES, 27.0, 19.0,
-        [[NSColor blackColor] set];
-        NSBezierPath *path = [NSBezierPath bezierPath];
-        [path moveToPoint:NSMakePoint(15.0, 11.5)];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(18.5, 11.5) toPoint:NSMakePoint(18.5, 2.5) radius:0.5];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(18.5, 2.5) toPoint:NSMakePoint(8.5, 2.5) radius:0.5];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(8.5, 2.5) toPoint:NSMakePoint(8.5, 11.5) radius:0.5];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(8.5, 11.5) toPoint:NSMakePoint(12.0, 11.5) radius:0.5];
-        [path lineToPoint:NSMakePoint(12.0, 11.5)];
-        [path moveToPoint:NSMakePoint(13.5, 7.0)];
-        [path lineToPoint:NSMakePoint(13.5, 16.0)];
-        [path stroke];
-        path = [NSBezierPath bezierPath];
-        [path moveToPoint:NSMakePoint(11.0, 13.5)];
-        [path lineToPoint:NSMakePoint(13.5, 16.5)];
-        [path lineToPoint:NSMakePoint(16.0, 13.5)];
-        [path setLineCapStyle:NSRoundLineCapStyle];
-        [path stroke];
+        NSImage *img = nil;
+        if (@available(macOS 11.0, *))
+           img = [NSImage imageWithSystemSymbolName:@"square.and.arrow.up" accessibilityDescription:nil];
+        if (img) {
+           [img drawInRect:NSMakeRect(6.0, 2.0, 15.0, 17.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+        } else {
+            [[NSColor blackColor] set];
+            NSBezierPath *path = [NSBezierPath bezierPath];
+            [path moveToPoint:NSMakePoint(15.0, 11.5)];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(18.5, 11.5) toPoint:NSMakePoint(18.5, 2.5) radius:0.5];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(18.5, 2.5) toPoint:NSMakePoint(8.5, 2.5) radius:0.5];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(8.5, 2.5) toPoint:NSMakePoint(8.5, 11.5) radius:0.5];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(8.5, 11.5) toPoint:NSMakePoint(12.0, 11.5) radius:0.5];
+            [path lineToPoint:NSMakePoint(12.0, 11.5)];
+            [path moveToPoint:NSMakePoint(13.5, 7.0)];
+            [path lineToPoint:NSMakePoint(13.5, 16.0)];
+            [path stroke];
+            path = [NSBezierPath bezierPath];
+            [path moveToPoint:NSMakePoint(11.0, 13.5)];
+            [path lineToPoint:NSMakePoint(13.5, 16.5)];
+            [path lineToPoint:NSMakePoint(16.0, 13.5)];
+            [path setLineCapStyle:NSRoundLineCapStyle];
+            [path stroke];
+        }
     );
     
     MAKE_IMAGE(SKImageNameToolbarPlay, YES, 27.0, 19.0,
@@ -1029,29 +1036,36 @@
     );
     
     MAKE_VECTOR_IMAGE(SKImageNameToolbarDelete, YES, 21.0, 19.0,
-        NSBezierPath *path = [NSBezierPath bezierPath];
-        [path moveToPoint:NSMakePoint(5.75, 14.25)];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(6.25, 3.5) toPoint:NSMakePoint(14.0, 3.5) radius:1.5];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(14.0, 3.5) toPoint:NSMakePoint(14.5, 14.25) radius:1.5];
-        [path lineToPoint:NSMakePoint(14.5, 14.25)];
-        [path moveToPoint:NSMakePoint(4.5, 14.25)];
-        [path lineToPoint:NSMakePoint(15.75, 14.25)];
-        [path moveToPoint:NSMakePoint(12.5, 14.25)];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(12.5, 16.75) toPoint:NSMakePoint(7.75, 16.75) radius:1.0];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(7.75, 16.75) toPoint:NSMakePoint(8.0, 14.25) radius:1];
-        [path lineToPoint:NSMakePoint(8.0, 14.25)];
-        [path setLineCapStyle:NSRoundLineCapStyle];
-        [path stroke];
-        path = [NSBezierPath bezierPath];
-        [path moveToPoint:NSMakePoint(10.125, 5.5)];
-        [path lineToPoint:NSMakePoint(10.125, 12.0)];
-        [path moveToPoint:NSMakePoint(8.25, 5.5)];
-        [path lineToPoint:NSMakePoint(8.0, 12.0)];
-        [path moveToPoint:NSMakePoint(12.0, 5.5)];
-        [path lineToPoint:NSMakePoint(12.25, 12.0)];
-        [path setLineWidth:0.8];
-        [path setLineCapStyle:NSRoundLineCapStyle];
-        [path stroke];
+        NSImage *img = nil;
+        if (@available(macOS 11.0, *))
+            img = [NSImage imageWithSystemSymbolName:@"trash" accessibilityDescription:nil];
+        if (img) {
+            [img drawInRect:NSMakeRect(3.0, 1.0, 15.0, 17.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+        } else {
+            NSBezierPath *path = [NSBezierPath bezierPath];
+            [path moveToPoint:NSMakePoint(5.75, 14.25)];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(6.25, 3.5) toPoint:NSMakePoint(14.0, 3.5) radius:1.5];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(14.0, 3.5) toPoint:NSMakePoint(14.5, 14.25) radius:1.5];
+            [path lineToPoint:NSMakePoint(14.5, 14.25)];
+            [path moveToPoint:NSMakePoint(4.5, 14.25)];
+            [path lineToPoint:NSMakePoint(15.75, 14.25)];
+            [path moveToPoint:NSMakePoint(12.5, 14.25)];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(12.5, 16.75) toPoint:NSMakePoint(7.75, 16.75) radius:1.0];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(7.75, 16.75) toPoint:NSMakePoint(8.0, 14.25) radius:1];
+            [path lineToPoint:NSMakePoint(8.0, 14.25)];
+            [path setLineCapStyle:NSRoundLineCapStyle];
+            [path stroke];
+            path = [NSBezierPath bezierPath];
+            [path moveToPoint:NSMakePoint(10.125, 5.5)];
+            [path lineToPoint:NSMakePoint(10.125, 12.0)];
+            [path moveToPoint:NSMakePoint(8.25, 5.5)];
+            [path lineToPoint:NSMakePoint(8.0, 12.0)];
+            [path moveToPoint:NSMakePoint(12.0, 5.5)];
+            [path lineToPoint:NSMakePoint(12.25, 12.0)];
+            [path setLineWidth:0.8];
+            [path setLineCapStyle:NSRoundLineCapStyle];
+            [path stroke];
+        }
     );
     
 #define MAKE_BADGED_IMAGES(name) \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15106] trunk/NSImage_SKExtensions.m

[<ho...@us...>]

Revision: 15106
          http://sourceforge.net/p/skim-app/code/15106
Author:   hofman
Date:     2025-04-09 09:36:17 +0000 (Wed, 09 Apr 2025)
Log Message:
-----------
One more SF Symbol. Checke whether SF Symbol is available before using it.

Modified Paths:
--------------
    trunk/NSImage_SKExtensions.m

Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m	2025-04-08 22:12:25 UTC (rev 15105)
+++ trunk/NSImage_SKExtensions.m	2025-04-09 09:36:17 UTC (rev 15106)
@@ -782,14 +782,21 @@
     );
     
     MAKE_IMAGE(SKImageNameToolbarNotes, YES, 27.0, 19.0,
-        translate(3.0, 0.0);
-        drawTextNote(nil);
-        [[NSColor blackColor] setStroke];
-        NSBezierPath *path = [NSBezierPath bezierPath];
-        [path moveToPoint:NSMakePoint(2.0, 3.0)];
-        [path lineToPoint:NSMakePoint(19.0, 3.0)];
-        [path setLineWidth:2.0];
-        [path stroke];
+        NSImage *img = nil;
+        if (@available(macOS 11.0, *))
+            img = [NSImage imageWithSystemSymbolName:@"pencil.tip.crop.circle" accessibilityDescription:nil];
+        if (img) {
+            [img drawInRect:NSMakeRect(6.0, 2.0, 15.0, 15.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+        } else {
+            translate(3.0, 0.0);
+            drawTextNote(nil);
+            [[NSColor blackColor] setStroke];
+            NSBezierPath *path = [NSBezierPath bezierPath];
+            [path moveToPoint:NSMakePoint(2.0, 3.0)];
+            [path lineToPoint:NSMakePoint(19.0, 3.0)];
+            [path setLineWidth:2.0];
+            [path stroke];
+        }
     );
     
     MAKE_IMAGE(SKImageNameToolbarMoveTool, YES, 27.0, 19.0, 
@@ -899,8 +906,11 @@
     );
     
     MAKE_IMAGE(SKImageNameToolbarInfo, YES, 27.0, 20.0,
-        if (@available(macOS 11.0, *)) {
-           [[NSImage imageWithSystemSymbolName:@"info.circle" accessibilityDescription:nil] drawInRect:NSMakeRect(6.0, 3.0, 15.0, 15.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+        NSImage *img = nil;
+        if (@available(macOS 11.0, *))
+            img = [NSImage imageWithSystemSymbolName:@"info.circle" accessibilityDescription:nil];
+        if (img) {
+            [img drawInRect:NSMakeRect(6.0, 3.0, 15.0, 15.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
         } else {
             NSBezierPath *path = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(7.5, 4.5, 12.0, 12.0)];
             [path stroke];
@@ -918,8 +928,11 @@
     );
     
     MAKE_IMAGE(SKImageNameToolbarFonts, YES, 27.0, 20.0,
-        if (@available(macOS 11.0, *)) {
-            [[NSImage imageWithSystemSymbolName:@"textformat" accessibilityDescription:nil] drawInRect:NSMakeRect(4.0, 4.0, 18.0, 12.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+        NSImage *img = nil;
+        if (@available(macOS 11.0, *))
+            img = [NSImage imageWithSystemSymbolName:@"textformat" accessibilityDescription:nil];
+        if (img) {
+            [img drawInRect:NSMakeRect(4.0, 4.0, 18.0, 12.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
         } else {
             [[NSColor blackColor] setFill];
             [NSBezierPath fillRect:NSMakeRect(4.0, 1.0, 19.0, 19.0)];
@@ -943,8 +956,11 @@
     );
     
     MAKE_IMAGE(SKImageNameToolbarPrint, YES, 27.0, 20.0, 
-        if (@available(macOS 11.0, *)) {
-            [[NSImage imageWithSystemSymbolName:@"printer" accessibilityDescription:nil] drawInRect:NSMakeRect(5.0, 2.0, 18.0, 16.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+        NSImage *img = nil;
+        if (@available(macOS 11.0, *))
+            img = [NSImage imageWithSystemSymbolName:@"printer" accessibilityDescription:nil];
+        if (img) {
+            [img drawInRect:NSMakeRect(5.0, 2.0, 18.0, 16.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
         } else {
             NSBezierPath *path = [NSBezierPath bezierPath];
             [path moveToPoint:NSMakePoint(7.5, 15.0)];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15105] trunk

[<ho...@us...>]

Revision: 15105
          http://sourceforge.net/p/skim-app/code/15105
Author:   hofman
Date:     2025-04-08 22:12:25 +0000 (Tue, 08 Apr 2025)
Log Message:
-----------
Use unfilled printer icon. Move info toolbar item to end.

Modified Paths:
--------------
    trunk/NSImage_SKExtensions.m
    trunk/SKMainToolbarController.m

Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m	2025-04-08 21:49:40 UTC (rev 15104)
+++ trunk/NSImage_SKExtensions.m	2025-04-08 22:12:25 UTC (rev 15105)
@@ -944,7 +944,7 @@
     
     MAKE_IMAGE(SKImageNameToolbarPrint, YES, 27.0, 20.0, 
         if (@available(macOS 11.0, *)) {
-            [[NSImage imageWithSystemSymbolName:@"printer.fill" accessibilityDescription:nil] drawInRect:NSMakeRect(5.0, 2.0, 18.0, 16.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+            [[NSImage imageWithSystemSymbolName:@"printer" accessibilityDescription:nil] drawInRect:NSMakeRect(5.0, 2.0, 18.0, 16.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
         } else {
             NSBezierPath *path = [NSBezierPath bezierPath];
             [path moveToPoint:NSMakePoint(7.5, 15.0)];

Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m	2025-04-08 21:49:40 UTC (rev 15104)
+++ trunk/SKMainToolbarController.m	2025-04-08 22:12:25 UTC (rev 15105)
@@ -947,10 +947,10 @@
         SKDocumentToolbarShareItemIdentifier,
         SKDocumentToolbarPacerItemIdentifier,
         SKDocumentToolbarColorSwatchItemIdentifier,
-        SKDocumentToolbarInfoItemIdentifier,
         SKDocumentToolbarColorsItemIdentifier,
         SKDocumentToolbarFontsItemIdentifier,
         SKDocumentToolbarLinesItemIdentifier,
+        SKDocumentToolbarInfoItemIdentifier,
         SKDocumentToolbarPrintItemIdentifier,
         NSToolbarFlexibleSpaceItemIdentifier,
         NSToolbarSpaceItemIdentifier,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15104] trunk/NSImage_SKExtens ions.m

[<ho...@us...>]

Revision: 15104
          http://sourceforge.net/p/skim-app/code/15104
Author:   hofman
Date:     2025-04-08 21:49:40 +0000 (Tue, 08 Apr 2025)
Log Message:
-----------
Use some SF symbols for some toolbar items

Modified Paths:
--------------
    trunk/NSImage_SKExtensions.m

Modified: trunk/NSImage_SKExtensions.m
===================================================================
--- trunk/NSImage_SKExtensions.m	2025-04-08 16:27:39 UTC (rev 15103)
+++ trunk/NSImage_SKExtensions.m	2025-04-08 21:49:40 UTC (rev 15104)
@@ -899,24 +899,32 @@
     );
     
     MAKE_IMAGE(SKImageNameToolbarInfo, YES, 27.0, 20.0,
-        NSBezierPath *path = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(7.5, 4.5, 12.0, 12.0)];
-        [path stroke];
-        path = [NSBezierPath bezierPath];
-        [path moveToPoint:NSMakePoint(12.0, 7.4)];
-        [path lineToPoint:NSMakePoint(15.3, 7.4)];
-        [path moveToPoint:NSMakePoint(13.7, 7.4)];
-        [path lineToPoint:NSMakePoint(13.7, 11.2)];
-        [path lineToPoint:NSMakePoint(12.2, 11.2)];
-        [path setLineWidth:0.8];
-        [path stroke];
-        path = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(12.7, 12.8, 1.5, 1.5)];
-        [path fill];
+        if (@available(macOS 11.0, *)) {
+           [[NSImage imageWithSystemSymbolName:@"info.circle" accessibilityDescription:nil] drawInRect:NSMakeRect(6.0, 3.0, 15.0, 15.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+        } else {
+            NSBezierPath *path = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(7.5, 4.5, 12.0, 12.0)];
+            [path stroke];
+            path = [NSBezierPath bezierPath];
+            [path moveToPoint:NSMakePoint(12.0, 7.4)];
+            [path lineToPoint:NSMakePoint(15.3, 7.4)];
+            [path moveToPoint:NSMakePoint(13.7, 7.4)];
+            [path lineToPoint:NSMakePoint(13.7, 11.2)];
+            [path lineToPoint:NSMakePoint(12.2, 11.2)];
+            [path setLineWidth:0.8];
+            [path stroke];
+            path = [NSBezierPath bezierPathWithOvalInRect:NSMakeRect(12.7, 12.8, 1.5, 1.5)];
+            [path fill];
+        }
     );
     
     MAKE_IMAGE(SKImageNameToolbarFonts, YES, 27.0, 20.0,
-        [[NSColor blackColor] setFill];
-        [NSBezierPath fillRect:NSMakeRect(4.0, 1.0, 19.0, 19.0)];
-        [[NSImage imageNamed:NSImageNameFontPanel] drawInRect:NSMakeRect(4.0, 1.0, 19.0, 19.0) fromRect:NSZeroRect operation:NSCompositingOperationDestinationAtop fraction:1.0];
+        if (@available(macOS 11.0, *)) {
+            [[NSImage imageWithSystemSymbolName:@"textformat" accessibilityDescription:nil] drawInRect:NSMakeRect(4.0, 4.0, 18.0, 12.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+        } else {
+            [[NSColor blackColor] setFill];
+            [NSBezierPath fillRect:NSMakeRect(4.0, 1.0, 19.0, 19.0)];
+            [[NSImage imageNamed:NSImageNameFontPanel] drawInRect:NSMakeRect(4.0, 1.0, 19.0, 19.0) fromRect:NSZeroRect operation:NSCompositingOperationDestinationAtop fraction:1.0];
+        }
     );
     
     MAKE_IMAGE(SKImageNameToolbarLines, YES, 27.0, 20.0,
@@ -935,27 +943,31 @@
     );
     
     MAKE_IMAGE(SKImageNameToolbarPrint, YES, 27.0, 20.0, 
-        NSBezierPath *path = [NSBezierPath bezierPath];
-        [path moveToPoint:NSMakePoint(7.5, 15.0)];
-        [path lineToPoint:NSMakePoint(7.5, 17.5)];
-        [path lineToPoint:NSMakePoint(19.5, 17.5)];
-        [path lineToPoint:NSMakePoint(19.5, 15.0)];
-        [[NSColor blackColor] set];
-        [path stroke];
-        path = [NSBezierPath bezierPath];
-        [path moveToPoint:NSMakePoint(5.0, 14.0)];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(24.0, 14.0) toPoint:NSMakePoint(24.0, 4.0) radius:2.0];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(24.0, 4.0) toPoint:NSMakePoint(20.0, 4.0) radius:1.0];
-        [path lineToPoint:NSMakePoint(20.0, 4.0)];
-        [path lineToPoint:NSMakePoint(20.0, 1.0)];
-        [path lineToPoint:NSMakePoint(7.0, 1.0)];
-        [path lineToPoint:NSMakePoint(7.0, 4.0)];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(3.0, 4.0) toPoint:NSMakePoint(3.0, 14.0) radius:1.0];
-        [path appendBezierPathWithArcFromPoint:NSMakePoint(3.0, 14.0) toPoint:NSMakePoint(5.0, 14.0) radius:2.0];
-        [path closePath];
-        [path appendBezierPathWithRect:NSMakeRect(8.0, 2.0, 11.0, 8.0)];
-        [path setWindingRule:NSEvenOddWindingRule];
-        [path fill];
+        if (@available(macOS 11.0, *)) {
+            [[NSImage imageWithSystemSymbolName:@"printer.fill" accessibilityDescription:nil] drawInRect:NSMakeRect(5.0, 2.0, 18.0, 16.0) fromRect:NSZeroRect operation:NSCompositingOperationSourceOver fraction:1.0];
+        } else {
+            NSBezierPath *path = [NSBezierPath bezierPath];
+            [path moveToPoint:NSMakePoint(7.5, 15.0)];
+            [path lineToPoint:NSMakePoint(7.5, 17.5)];
+            [path lineToPoint:NSMakePoint(19.5, 17.5)];
+            [path lineToPoint:NSMakePoint(19.5, 15.0)];
+            [[NSColor blackColor] set];
+            [path stroke];
+            path = [NSBezierPath bezierPath];
+            [path moveToPoint:NSMakePoint(5.0, 14.0)];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(24.0, 14.0) toPoint:NSMakePoint(24.0, 4.0) radius:2.0];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(24.0, 4.0) toPoint:NSMakePoint(20.0, 4.0) radius:1.0];
+            [path lineToPoint:NSMakePoint(20.0, 4.0)];
+            [path lineToPoint:NSMakePoint(20.0, 1.0)];
+            [path lineToPoint:NSMakePoint(7.0, 1.0)];
+            [path lineToPoint:NSMakePoint(7.0, 4.0)];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(3.0, 4.0) toPoint:NSMakePoint(3.0, 14.0) radius:1.0];
+            [path appendBezierPathWithArcFromPoint:NSMakePoint(3.0, 14.0) toPoint:NSMakePoint(5.0, 14.0) radius:2.0];
+            [path closePath];
+            [path appendBezierPathWithRect:NSMakeRect(8.0, 2.0, 11.0, 8.0)];
+            [path setWindingRule:NSEvenOddWindingRule];
+            [path fill];
+        }
     );
     
     MAKE_VECTOR_IMAGE(SKImageNameToolbarNewFolder, YES, 21.0, 19.0,

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15103] trunk/SKFontWell.m

[<ho...@us...>]

Revision: 15103
          http://sourceforge.net/p/skim-app/code/15103
Author:   hofman
Date:     2025-04-08 16:27:39 +0000 (Tue, 08 Apr 2025)
Log Message:
-----------
use secondary label color for T

Modified Paths:
--------------
    trunk/SKFontWell.m

Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m	2025-04-08 14:29:02 UTC (rev 15102)
+++ trunk/SKFontWell.m	2025-04-08 16:27:39 UTC (rev 15103)
@@ -438,18 +438,13 @@
     
     if ([self hasTextColor]) {
         NSRect rect = NSMakeRect(NSMaxX(frame) - 12.0, 2.0, 10.0, 10.0);
-        NSAttributedString *T = [[NSAttributedString alloc] initWithString:@"T" attributes:@{NSForegroundColorAttributeName: [NSColor labelColor], NSFontAttributeName: [NSFont fontWithName:@"Palatino-Bold" size:8.0]}];
+        NSAttributedString *T = [[NSAttributedString alloc] initWithString:@"T" attributes:@{NSForegroundColorAttributeName: [NSColor secondaryLabelColor], NSFontAttributeName: [NSFont fontWithName:@"Palatino-Bold" size:8.0]}];
         NSSize size = [T size];
         [T drawInRect:NSMakeRect(NSMinX(rect) - ceil(size.width) - 2.0, floor(NSMidY(rect) - 0.5 * size.height), size.width, size.height)];
         [NSGraphicsContext saveGraphicsState];
         [[self textColor] drawSwatchInRect:rect];
-        if (SKHasDarkAppearance()) {
-            [[NSColor colorWithGenericGamma22White:1.0 alpha:0.5] setStroke];
-            [[NSGraphicsContext currentContext] setCompositingOperation:NSCompositingOperationScreen];
-        } else {
-            [[NSColor colorWithGenericGamma22White:0.0 alpha:0.5] setStroke];
-            [[NSGraphicsContext currentContext] setCompositingOperation:NSCompositingOperationMultiply];
-        }
+        [[[NSColor textColor] colorWithAlphaComponent:0.5] setStroke];
+        [[NSGraphicsContext currentContext] setCompositingOperation:SKHasDarkAppearance() ? NSCompositingOperationScreen : NSCompositingOperationMultiply];
         [NSBezierPath strokeRect:NSInsetRect(rect, 0.5, 0.5)];
         [NSGraphicsContext restoreGraphicsState];
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15102] trunk/SKFontWell.m

[<ho...@us...>]

Revision: 15102
          http://sourceforge.net/p/skim-app/code/15102
Author:   hofman
Date:     2025-04-08 14:29:02 +0000 (Tue, 08 Apr 2025)
Log Message:
-----------
remove substracting 0

Modified Paths:
--------------
    trunk/SKFontWell.m

Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m	2025-04-08 09:10:17 UTC (rev 15101)
+++ trunk/SKFontWell.m	2025-04-08 14:29:02 UTC (rev 15102)
@@ -440,7 +440,7 @@
         NSRect rect = NSMakeRect(NSMaxX(frame) - 12.0, 2.0, 10.0, 10.0);
         NSAttributedString *T = [[NSAttributedString alloc] initWithString:@"T" attributes:@{NSForegroundColorAttributeName: [NSColor labelColor], NSFontAttributeName: [NSFont fontWithName:@"Palatino-Bold" size:8.0]}];
         NSSize size = [T size];
-        [T drawInRect:NSMakeRect(NSMinX(rect) - ceil(size.width) - 2.0, floor(NSMidY(rect) - 0.5 * size.height) - 0.0, size.width, size.height)];
+        [T drawInRect:NSMakeRect(NSMinX(rect) - ceil(size.width) - 2.0, floor(NSMidY(rect) - 0.5 * size.height), size.width, size.height)];
         [NSGraphicsContext saveGraphicsState];
         [[self textColor] drawSwatchInRect:rect];
         if (SKHasDarkAppearance()) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15101] trunk/SKFontWell.m

[<ho...@us...>]

Revision: 15101
          http://sourceforge.net/p/skim-app/code/15101
Author:   hofman
Date:     2025-04-08 09:10:17 +0000 (Tue, 08 Apr 2025)
Log Message:
-----------
Don't reset text color when deactivating cfont wwell. We also don't reset the font.

Modified Paths:
--------------
    trunk/SKFontWell.m

Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m	2025-04-07 16:27:17 UTC (rev 15100)
+++ trunk/SKFontWell.m	2025-04-08 09:10:17 UTC (rev 15101)
@@ -164,13 +164,10 @@
 
 - (void)changeActive:(id)sender {
     if ([self isEnabled]) {
-        if ([self isActive]) {
+        if ([self isActive])
             [self activate];
-        } else {
+        else
             [self deactivate];
-            if ([self hasTextColor])
-                [[NSFontManager sharedFontManager] setSelectedAttributes:@{NSForegroundColorAttributeName: [NSColor textColor]} isMultiple:NO];
-        }
     }
 }
 
@@ -195,12 +192,9 @@
 }
 
 - (void)deactivate {
-    BOOL wasActive = [self isActive];
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     [self setState:NSControlStateValueOff];
     [self setNeedsDisplay:YES];
-    if (wasActive && [self hasTextColor])
-        [[NSFontManager sharedFontManager] setSelectedAttributes:@{NSForegroundColorAttributeName: [NSColor textColor]} isMultiple:NO];
 }
 
 - (void)fontChanged {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15100] trunk/SKFontWell.m

[<ho...@us...>]

Revision: 15100
          http://sourceforge.net/p/skim-app/code/15100
Author:   hofman
Date:     2025-04-07 16:27:17 +0000 (Mon, 07 Apr 2025)
Log Message:
-----------
use Palatino-Bold

Modified Paths:
--------------
    trunk/SKFontWell.m

Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m	2025-04-07 15:46:44 UTC (rev 15099)
+++ trunk/SKFontWell.m	2025-04-07 16:27:17 UTC (rev 15100)
@@ -46,7 +46,7 @@
 
 #define SKNSFontPanelDescriptorsPboardType @"NSFontPanelDescriptorsPboardType"
 #define SKNSFontPanelFamiliesPboardType @"NSFontPanelFamiliesPboardType"
-#define UTIForNSPboardType(type) CFBridgingRelease(UTTypeCreatePreferredIdentifierForTag(kUTTagClassNSPboardType, (__bridge CFStringRef)type, kUTTypeData))
+
 #define SKNSFontCollectionFontDescriptors @"NSFontCollectionFontDescriptors"
 
 #define SKFontWellWillBecomeActiveNotification @"SKFontWellWillBecomeActiveNotification"
@@ -293,7 +293,7 @@
         NSDictionary *dict = @{SKNSFontCollectionFontDescriptors: @[[[self font] fontDescriptor]], NSFontSizeAttribute: [NSNumber numberWithDouble:[[self font] pointSize]]};
         NSData *data = [NSKeyedArchiver archivedDataWithRootObject:dict];
         NSPasteboardItem *item = [[NSPasteboardItem alloc] init];
-        [item setData:data forType:UTIForNSPboardType(SKNSFontPanelDescriptorsPboardType)];
+        [item setData:data forType:CFBridgingRelease(UTTypeCreatePreferredIdentifierForTag(kUTTagClassNSPboardType, (__bridge CFStringRef)SKNSFontPanelDescriptorsPboardType, kUTTypeData))];
         
         NSDraggingItem *dragItem = [[NSDraggingItem alloc] initWithPasteboardWriter:item];
         [dragItem setDraggingFrame:bounds contents:dragImage];
@@ -444,7 +444,7 @@
     
     if ([self hasTextColor]) {
         NSRect rect = NSMakeRect(NSMaxX(frame) - 12.0, 2.0, 10.0, 10.0);
-        NSAttributedString *T = [[NSAttributedString alloc] initWithString:@"T" attributes:@{NSForegroundColorAttributeName: [NSColor labelColor], NSFontAttributeName: [NSFont fontWithName:@"Palatino" size:8.0]}];
+        NSAttributedString *T = [[NSAttributedString alloc] initWithString:@"T" attributes:@{NSForegroundColorAttributeName: [NSColor labelColor], NSFontAttributeName: [NSFont fontWithName:@"Palatino-Bold" size:8.0]}];
         NSSize size = [T size];
         [T drawInRect:NSMakeRect(NSMinX(rect) - ceil(size.width) - 2.0, floor(NSMidY(rect) - 0.5 * size.height) - 0.0, size.width, size.height)];
         [NSGraphicsContext saveGraphicsState];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Skim-app-commit] SF.net SVN: skim-app:[15099] trunk/SKFontWell.m

[<ho...@us...>]

Revision: 15099
          http://sourceforge.net/p/skim-app/code/15099
Author:   hofman
Date:     2025-04-07 15:46:44 +0000 (Mon, 07 Apr 2025)
Log Message:
-----------
UTI for NSPboardType should inherit from public.data

Modified Paths:
--------------
    trunk/SKFontWell.m

Modified: trunk/SKFontWell.m
===================================================================
--- trunk/SKFontWell.m	2025-04-07 14:13:23 UTC (rev 15098)
+++ trunk/SKFontWell.m	2025-04-07 15:46:44 UTC (rev 15099)
@@ -46,7 +46,7 @@
 
 #define SKNSFontPanelDescriptorsPboardType @"NSFontPanelDescriptorsPboardType"
 #define SKNSFontPanelFamiliesPboardType @"NSFontPanelFamiliesPboardType"
-#define UTIForNSPboardType(type) CFBridgingRelease(UTTypeCreatePreferredIdentifierForTag(kUTTagClassNSPboardType, (__bridge CFStringRef)type, NULL))
+#define UTIForNSPboardType(type) CFBridgingRelease(UTTypeCreatePreferredIdentifierForTag(kUTTagClassNSPboardType, (__bridge CFStringRef)type, kUTTypeData))
 #define SKNSFontCollectionFontDescriptors @"NSFontCollectionFontDescriptors"
 
 #define SKFontWellWillBecomeActiveNotification @"SKFontWellWillBecomeActiveNotification"
@@ -344,7 +344,7 @@
     
     @try {
         if ([type isEqualToString:SKNSFontPanelDescriptorsPboardType]) {
-            NSData *data = [pboard dataForType:type] ?: [pboard dataForType:UTIForNSPboardType(type)];
+            NSData *data = [pboard dataForType:type];
             NSDictionary *dict = [data isKindOfClass:[NSData class]] ? [NSKeyedUnarchiver unarchiveObjectWithData:data] : nil;
             if ([dict isKindOfClass:[NSDictionary class]]) {
                 NSArray *fontDescriptors = [dict objectForKey:SKNSFontCollectionFontDescriptors];
@@ -356,7 +356,7 @@
                 }
             }
         } else if ([type isEqualToString:SKNSFontPanelFamiliesPboardType]) {
-            NSArray *families = [pboard propertyListForType:type] ?: [pboard propertyListForType:UTIForNSPboardType(type)];
+            NSArray *families = [pboard propertyListForType:type];
             NSString *family = ([families isKindOfClass:[NSArray class]] && [families count]) ? [families objectAtIndex:0] : nil;
             if ([family isKindOfClass:[NSString class]])
                 droppedFont = [[NSFontManager sharedFontManager] convertFont:[self font] toFamily:family];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.