kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #68 from nevack/nevack/update-mini-window 

Update Mini Window toolbar item priority
CQTexperiment
Christopher Snowhill 2021-01-06 21:06:54 -08:00 committed by GitHub
parent 1b7948ef9d 52c31c5117
commit c0a349d694
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Application/AppController.m
View File

@ -68,7 +68,7 @@
[p setResolvesAliases:YES]; [p setResolvesAliases:YES];
[p beginSheetModalForWindow:mainWindow completionHandler:^(NSInteger result) { [p beginSheetModalForWindow:mainWindow completionHandler:^(NSInteger result) {
if ( result == NSFileHandlingPanelOKButton ) { if ( result == NSModalResponseOK ) {
[self->playlistLoader willInsertURLs:[p URLs] origin:URLOriginInternal]; [self->playlistLoader willInsertURLs:[p URLs] origin:URLOriginInternal];
[self->playlistLoader didInsertURLs:[self->playlistLoader addURLs:[p URLs] sort:YES] origin:URLOriginInternal]; [self->playlistLoader didInsertURLs:[self->playlistLoader addURLs:[p URLs] sort:YES] origin:URLOriginInternal];
} else { } else {
@ -84,7 +84,7 @@
p = [NSSavePanel savePanel]; p = [NSSavePanel savePanel];
[p beginSheetModalForWindow:mainWindow completionHandler:^(NSInteger result) { [p beginSheetModalForWindow:mainWindow completionHandler:^(NSInteger result) {
if ( result == NSFileHandlingPanelOKButton ) { if ( result == NSModalResponseOK ) {
[self->playlistLoader save:[[p URL] path]]; [self->playlistLoader save:[[p URL] path]];
} else { } else {
[p close]; [p close];
@ -103,7 +103,7 @@
- (void)openURLPanelDidEnd:(OpenURLPanel *)panel returnCode:(int)returnCode contextInfo:(void *)contextInfo - (void)openURLPanelDidEnd:(OpenURLPanel *)panel returnCode:(int)returnCode contextInfo:(void *)contextInfo
{ {
if (returnCode == NSOKButton) if (returnCode == NSModalResponseOK)
{ {
[playlistLoader willInsertURLs:[NSArray arrayWithObject:[panel url]] origin:URLOriginInternal]; [playlistLoader willInsertURLs:[NSArray arrayWithObject:[panel url]] origin:URLOriginInternal];
[playlistLoader didInsertURLs:[playlistLoader addURLs:[NSArray arrayWithObject:[panel url]] sort:NO] origin:URLOriginInternal]; [playlistLoader didInsertURLs:[playlistLoader addURLs:[NSArray arrayWithObject:[panel url]] sort:NO] origin:URLOriginInternal];
@ -170,6 +170,7 @@
} }
} }
[[miniWindow standardWindowButton:NSWindowZoomButton] setHidden:YES];
// Restore mini mode // Restore mini mode
[self setMiniMode:[[NSUserDefaults standardUserDefaults] boolForKey:@"miniMode"]]; [self setMiniMode:[[NSUserDefaults standardUserDefaults] boolForKey:@"miniMode"]];
@ -377,7 +378,7 @@
NSMutableDictionary *userDefaultsValuesDict = [NSMutableDictionary dictionary]; NSMutableDictionary *userDefaultsValuesDict = [NSMutableDictionary dictionary];
// Font defaults // Font defaults
float fFontSize = [NSFont systemFontSizeForControlSize:NSSmallControlSize]; float fFontSize = [NSFont systemFontSizeForControlSize:NSControlSizeSmall];
NSNumber *fontSize = [NSNumber numberWithFloat:fFontSize]; NSNumber *fontSize = [NSNumber numberWithFloat:fFontSize];
[userDefaultsValuesDict setObject:fontSize forKey:@"fontSize"]; [userDefaultsValuesDict setObject:fontSize forKey:@"fontSize"];

18
Base.lproj/MainMenu.xib
View File

@ -582,21 +582,21 @@
</connections> </connections>
<point key="canvasLocation" x="130.5" y="131"/> <point key="canvasLocation" x="130.5" y="131"/>
</window> </window>
<window title="Cog" allowsToolTipsWhenApplicationIsInactive="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="Mini Window" animationBehavior="default" toolbarStyle="expanded" id="2234" userLabel="Mini Window (Window)" customClass="MiniWindow"> <window title="Cog" separatorStyle="none" allowsToolTipsWhenApplicationIsInactive="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="Mini Window" animationBehavior="default" titlebarAppearsTransparent="YES" toolbarStyle="expanded" id="2234" userLabel="Mini Window (Window)" customClass="MiniWindow">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES"/> <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<rect key="contentRect" x="192" y="547" width="480" height="0.0"/> <rect key="contentRect" x="192" y="547" width="480" height="1"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/> <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
<value key="minSize" type="size" width="400" height="0.0"/> <value key="minSize" type="size" width="280" height="1"/>
<value key="maxSize" type="size" width="600" height="0.0"/> <value key="maxSize" type="size" width="600" height="1"/>
<view key="contentView" hidden="YES" wantsLayer="YES" id="2235"> <view key="contentView" hidden="YES" wantsLayer="YES" id="2235">
<rect key="frame" x="0.0" y="0.0" width="480" height="0.0"/> <rect key="frame" x="0.0" y="0.0" width="480" height="1"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view> </view>
<toolbar key="toolbar" implicitIdentifier="35998ECE-5AD8-429E-8479-657249B22C9C" displayMode="iconOnly" sizeMode="regular" id="2222" userLabel="Mini Toolbar"> <toolbar key="toolbar" implicitIdentifier="35998ECE-5AD8-429E-8479-657249B22C9C" displayMode="iconOnly" sizeMode="regular" id="2222" userLabel="Mini Toolbar">
<allowedToolbarItems> <allowedToolbarItems>
<toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="2227"/> <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="2227"/>
<toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="2228"/> <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="2228"/>
<toolbarItem implicitItemIdentifier="6F5A6C43-A09C-462A-AEE2-C86DC3C55128" label="Playback Buttons" paletteLabel="Playback Buttons" sizingBehavior="auto" id="2272"> <toolbarItem implicitItemIdentifier="6F5A6C43-A09C-462A-AEE2-C86DC3C55128" label="Playback Buttons" paletteLabel="Playback Buttons" visibilityPriority="15" sizingBehavior="auto" id="2272">
<nil key="toolTip"/> <nil key="toolTip"/>
<segmentedControl key="view" verticalHuggingPriority="750" id="2295" customClass="PlaybackButtons"> <segmentedControl key="view" verticalHuggingPriority="750" id="2295" customClass="PlaybackButtons">
<rect key="frame" x="0.0" y="14" width="133" height="23"/> <rect key="frame" x="0.0" y="14" width="133" height="23"/>
@ -617,7 +617,7 @@
</connections> </connections>
</segmentedControl> </segmentedControl>
</toolbarItem> </toolbarItem>
<toolbarItem implicitItemIdentifier="C10E329B-9AB7-47DB-B3BA-7C40B57792E8" label="Position" paletteLabel="Position" sizingBehavior="auto" id="2273"> <toolbarItem implicitItemIdentifier="C10E329B-9AB7-47DB-B3BA-7C40B57792E8" label="Position" paletteLabel="Position" visibilityPriority="15" sizingBehavior="auto" id="2273" customClass="PositionSliderToolbarItem" customModule="Cog" customModuleProvider="target">
<nil key="toolTip"/> <nil key="toolTip"/>
<slider key="view" verticalHuggingPriority="750" id="2293" customClass="PositionSlider"> <slider key="view" verticalHuggingPriority="750" id="2293" customClass="PositionSlider">
<rect key="frame" x="0.0" y="14" width="96" height="20"/> <rect key="frame" x="0.0" y="14" width="96" height="20"/>