mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

[macOS] Revamp Toolbar Segments (#3512) 

Fixes #3498.
This commit is contained in:
Dzmitry Neviadomski 2022-07-23 22:37:57 +03:00 committed by GitHub
parent 842de6e180
commit 42924f3e97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
macosx/Controller.mm
View File

@ -4163,14 +4163,33 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
{ {
GroupToolbarItem* groupItem = [[GroupToolbarItem alloc] initWithItemIdentifier:ident]; GroupToolbarItem* groupItem = [[GroupToolbarItem alloc] initWithItemIdentifier:ident];
NSSegmentedControl* segmentedControl = [[NSSegmentedControl alloc] initWithFrame:NSZeroRect]; NSToolbarItem* itemPause = [self standardToolbarButtonWithIdentifier:TOOLBAR_PAUSE_ALL];
segmentedControl.cell = [[ToolbarSegmentedCell alloc] init]; NSToolbarItem* itemResume = [self standardToolbarButtonWithIdentifier:TOOLBAR_RESUME_ALL];
groupItem.view = segmentedControl;
NSSegmentedCell* segmentedCell = (NSSegmentedCell*)segmentedControl.cell;
segmentedControl.segmentStyle = NSSegmentStyleSeparated;
NSSegmentedControl* segmentedControl = [[NSSegmentedControl alloc] initWithFrame:NSZeroRect];
segmentedControl.segmentStyle = NSSegmentStyleTexturedRounded;
segmentedControl.trackingMode = NSSegmentSwitchTrackingMomentary;
segmentedControl.segmentCount = 2; segmentedControl.segmentCount = 2;
segmentedCell.trackingMode = NSSegmentSwitchTrackingMomentary;
[segmentedControl setTag:TOOLBAR_PAUSE_TAG forSegment:TOOLBAR_PAUSE_TAG];
[segmentedControl setImage:[NSImage systemSymbol:@"pause.circle.fill" withFallback:@"ToolbarPauseAllTemplate"]
forSegment:TOOLBAR_PAUSE_TAG];
[segmentedControl setToolTip:NSLocalizedString(@"Pause all transfers", "All toolbar item -> tooltip")
forSegment:TOOLBAR_PAUSE_TAG];
[segmentedControl setTag:TOOLBAR_RESUME_TAG forSegment:TOOLBAR_RESUME_TAG];
[segmentedControl setImage:[NSImage systemSymbol:@"arrow.clockwise.circle.fill" withFallback:@"ToolbarResumeAllTemplate"]
forSegment:TOOLBAR_RESUME_TAG];
[segmentedControl setToolTip:NSLocalizedString(@"Resume all transfers", "All toolbar item -> tooltip")
forSegment:TOOLBAR_RESUME_TAG];
groupItem.label = NSLocalizedString(@"Apply All", "All toolbar item -> label");
groupItem.paletteLabel = NSLocalizedString(@"Pause / Resume All", "All toolbar item -> palette label");
groupItem.visibilityPriority = NSToolbarItemVisibilityPriorityHigh;
groupItem.subitems = @[ itemPause, itemResume ];
groupItem.view = segmentedControl;
groupItem.target = self;
groupItem.action = @selector(allToolbarClicked:);
if (@available(macOS 11.0, *)) if (@available(macOS 11.0, *))
{ {
@ -4183,45 +4202,45 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
groupItem.maxSize = groupSize; groupItem.maxSize = groupSize;
} }
groupItem.label = NSLocalizedString(@"Apply All", "All toolbar item -> label");
groupItem.paletteLabel = NSLocalizedString(@"Pause / Resume All", "All toolbar item -> palette label");
groupItem.target = self;
groupItem.action = @selector(allToolbarClicked:);
groupItem.identifiers = @[ TOOLBAR_PAUSE_ALL, TOOLBAR_RESUME_ALL ];
[segmentedCell setTag:TOOLBAR_PAUSE_TAG forSegment:TOOLBAR_PAUSE_TAG];
[segmentedControl setImage:[NSImage largeSystemSymbol:@"pause.circle.fill" withFallback:@"ToolbarPauseAllTemplate"]
forSegment:TOOLBAR_PAUSE_TAG];
[segmentedCell setToolTip:NSLocalizedString(@"Pause all transfers", "All toolbar item -> tooltip") forSegment:TOOLBAR_PAUSE_TAG];
[segmentedCell setTag:TOOLBAR_RESUME_TAG forSegment:TOOLBAR_RESUME_TAG];
[segmentedControl setImage:[NSImage imageNamed:@"ToolbarResumeAllTemplate"] forSegment:TOOLBAR_RESUME_TAG];
[segmentedControl setImage:[NSImage largeSystemSymbol:@"arrow.clockwise.circle.fill" withFallback:@"ToolbarResumeAllTemplate"]
forSegment:TOOLBAR_RESUME_TAG];
[segmentedCell setToolTip:NSLocalizedString(@"Resume all transfers", "All toolbar item -> tooltip")
forSegment:TOOLBAR_RESUME_TAG];
[groupItem createMenu:@[ [groupItem createMenu:@[
NSLocalizedString(@"Pause All", "All toolbar item -> label"), NSLocalizedString(@"Pause All", "All toolbar item -> label"),
NSLocalizedString(@"Resume All", "All toolbar item -> label") NSLocalizedString(@"Resume All", "All toolbar item -> label")
]]; ]];
groupItem.visibilityPriority = NSToolbarItemVisibilityPriorityHigh;
return groupItem; return groupItem;
} }
else if ([ident isEqualToString:TOOLBAR_PAUSE_RESUME_SELECTED]) else if ([ident isEqualToString:TOOLBAR_PAUSE_RESUME_SELECTED])
{ {
GroupToolbarItem* groupItem = [[GroupToolbarItem alloc] initWithItemIdentifier:ident]; GroupToolbarItem* groupItem = [[GroupToolbarItem alloc] initWithItemIdentifier:ident];
NSSegmentedControl* segmentedControl = [[NSSegmentedControl alloc] initWithFrame:NSZeroRect]; NSToolbarItem* itemPause = [self standardToolbarButtonWithIdentifier:TOOLBAR_PAUSE_SELECTED];
segmentedControl.cell = [[ToolbarSegmentedCell alloc] init]; NSToolbarItem* itemResume = [self standardToolbarButtonWithIdentifier:TOOLBAR_RESUME_SELECTED];
groupItem.view = segmentedControl;
NSSegmentedCell* segmentedCell = (NSSegmentedCell*)segmentedControl.cell;
NSSegmentedControl* segmentedControl = [[NSSegmentedControl alloc] initWithFrame:NSZeroRect];
segmentedControl.segmentStyle = NSSegmentStyleTexturedRounded;
segmentedControl.trackingMode = NSSegmentSwitchTrackingMomentary;
segmentedControl.segmentCount = 2; segmentedControl.segmentCount = 2;
segmentedCell.trackingMode = NSSegmentSwitchTrackingMomentary;
[segmentedControl setTag:TOOLBAR_PAUSE_TAG forSegment:TOOLBAR_PAUSE_TAG];
[segmentedControl setImage:[NSImage systemSymbol:@"pause" withFallback:@"ToolbarPauseSelectedTemplate"]
forSegment:TOOLBAR_PAUSE_TAG];
[segmentedControl setToolTip:NSLocalizedString(@"Pause selected transfers", "Selected toolbar item -> tooltip")
forSegment:TOOLBAR_PAUSE_TAG];
[segmentedControl setTag:TOOLBAR_RESUME_TAG forSegment:TOOLBAR_RESUME_TAG];
[segmentedControl setImage:[NSImage systemSymbol:@"arrow.clockwise" withFallback:@"ToolbarResumeSelectedTemplate"]
forSegment:TOOLBAR_RESUME_TAG];
[segmentedControl setToolTip:NSLocalizedString(@"Resume selected transfers", "Selected toolbar item -> tooltip")
forSegment:TOOLBAR_RESUME_TAG];
groupItem.view = segmentedControl;
groupItem.label = NSLocalizedString(@"Apply Selected", "Selected toolbar item -> label");
groupItem.paletteLabel = NSLocalizedString(@"Pause / Resume Selected", "Selected toolbar item -> palette label");
groupItem.visibilityPriority = NSToolbarItemVisibilityPriorityHigh;
groupItem.subitems = @[ itemPause, itemResume ];
groupItem.view = segmentedControl;
groupItem.target = self;
groupItem.action = @selector(selectedToolbarClicked:);
if (@available(macOS 11.0, *)) if (@available(macOS 11.0, *))
{ {
@ -4234,32 +4253,11 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
groupItem.maxSize = groupSize; groupItem.maxSize = groupSize;
} }
groupItem.label = NSLocalizedString(@"Apply Selected", "Selected toolbar item -> label");
groupItem.paletteLabel = NSLocalizedString(@"Pause / Resume Selected", "Selected toolbar item -> palette label");
groupItem.target = self;
groupItem.action = @selector(selectedToolbarClicked:);
groupItem.identifiers = @[ TOOLBAR_PAUSE_SELECTED, TOOLBAR_RESUME_SELECTED ];
[segmentedCell setTag:TOOLBAR_PAUSE_TAG forSegment:TOOLBAR_PAUSE_TAG];
[segmentedControl setImage:[NSImage largeSystemSymbol:@"pause" withFallback:@"ToolbarPauseSelectedTemplate"]
forSegment:TOOLBAR_PAUSE_TAG];
[segmentedCell setToolTip:NSLocalizedString(@"Pause selected transfers", "Selected toolbar item -> tooltip")
forSegment:TOOLBAR_PAUSE_TAG];
[segmentedCell setTag:TOOLBAR_RESUME_TAG forSegment:TOOLBAR_RESUME_TAG];
[segmentedControl setImage:[NSImage systemSymbol:@"arrow.clockwise" withFallback:@"ToolbarResumeSelectedTemplate"]
forSegment:TOOLBAR_RESUME_TAG];
[segmentedCell setToolTip:NSLocalizedString(@"Resume selected transfers", "Selected toolbar item -> tooltip")
forSegment:TOOLBAR_RESUME_TAG];
[groupItem createMenu:@[ [groupItem createMenu:@[
NSLocalizedString(@"Pause Selected", "Selected toolbar item -> label"), NSLocalizedString(@"Pause Selected", "Selected toolbar item -> label"),
NSLocalizedString(@"Resume Selected", "Selected toolbar item -> label") NSLocalizedString(@"Resume Selected", "Selected toolbar item -> label")
]]; ]];
groupItem.visibilityPriority = NSToolbarItemVisibilityPriorityHigh;
return groupItem; return groupItem;
} }
else if ([ident isEqualToString:TOOLBAR_FILTER]) else if ([ident isEqualToString:TOOLBAR_FILTER])
@ -4316,9 +4314,8 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
- (void)allToolbarClicked:(id)sender - (void)allToolbarClicked:(id)sender
{ {
NSInteger tagValue = [sender isKindOfClass:[NSSegmentedControl class]] ? NSInteger tagValue = [sender isKindOfClass:[NSSegmentedControl class]] ? [(NSSegmentedControl*)sender selectedTag] :
[(NSSegmentedCell*)[sender cell] tagForSegment:[sender selectedSegment]] : ((NSControl*)sender).tag;
((NSControl*)sender).tag;
switch (tagValue) switch (tagValue)
{ {
case TOOLBAR_PAUSE_TAG: case TOOLBAR_PAUSE_TAG:
@ -4332,9 +4329,8 @@ void onTorrentCompletenessChanged(tr_torrent* tor, tr_completeness status, bool
- (void)selectedToolbarClicked:(id)sender - (void)selectedToolbarClicked:(id)sender
{ {
NSInteger tagValue = [sender isKindOfClass:[NSSegmentedControl class]] ? NSInteger tagValue = [sender isKindOfClass:[NSSegmentedControl class]] ? [(NSSegmentedControl*)sender selectedTag] :
[(NSSegmentedCell*)[sender cell] tagForSegment:[sender selectedSegment]] : ((NSControl*)sender).tag;
((NSControl*)sender).tag;
switch (tagValue) switch (tagValue)
{ {
case TOOLBAR_PAUSE_TAG: case TOOLBAR_PAUSE_TAG:

4
macosx/GroupToolbarItem.h
View File

@ -4,9 +4,7 @@
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
@interface GroupToolbarItem : NSToolbarItem @interface GroupToolbarItem : NSToolbarItemGroup
@property(nonatomic, copy) NSArray* identifiers;
- (void)createMenu:(NSArray*)labels; - (void)createMenu:(NSArray*)labels;

15
macosx/GroupToolbarItem.mm
View File

@ -10,10 +10,11 @@
{ {
NSSegmentedControl* control = (NSSegmentedControl*)self.view; NSSegmentedControl* control = (NSSegmentedControl*)self.view;
for (NSInteger i = 0; i < control.segmentCount; i++) NSInteger const count = self.subitems.count;
for (NSInteger i = 0; i < count; i++)
{ {
[control setEnabled:[self.target validateToolbarItem:[[NSToolbarItem alloc] initWithItemIdentifier:self.identifiers[i]]] NSToolbarItem* item = self.subitems[i];
forSegment:i]; [control setEnabled:[self.target validateToolbarItem:item] forSegment:i];
} }
} }
@ -25,7 +26,7 @@
menu.autoenablesItems = NO; menu.autoenablesItems = NO;
NSInteger const count = ((NSSegmentedControl*)self.view).segmentCount; NSInteger const count = self.subitems.count;
for (NSInteger i = 0; i < count; i++) for (NSInteger i = 0; i < count; i++)
{ {
NSMenuItem* addItem = [[NSMenuItem alloc] initWithTitle:labels[i] action:self.action keyEquivalent:@""]; NSMenuItem* addItem = [[NSMenuItem alloc] initWithTitle:labels[i] action:self.action keyEquivalent:@""];
@ -42,11 +43,11 @@
{ {
NSMenuItem* menuItem = super.menuFormRepresentation; NSMenuItem* menuItem = super.menuFormRepresentation;
NSInteger const count = ((NSSegmentedControl*)self.view).segmentCount; NSInteger const count = self.subitems.count;
for (NSInteger i = 0; i < count; i++) for (NSInteger i = 0; i < count; i++)
{ {
[menuItem.submenu itemAtIndex:i].enabled = [self.target NSToolbarItem* item = self.subitems[i];
validateToolbarItem:[[NSToolbarItem alloc] initWithItemIdentifier:self.identifiers[i]]]; [menuItem.submenu itemAtIndex:i].enabled = [self.target validateToolbarItem:item];
} }
return menuItem; return menuItem;