Skip to content

GitLab

C
cog

If you have an issue with any of our projects. feel free to register.

Commit 6a424312 authored by Dmitry Nevedomsky's avatar Dmitry Nevedomsky
Browse files
Options

Update Toolbar items visibility. 

Use backported NSSearchToolbarItem to support collapsed state.
Give more priority to Playback controls.
Fix sizing of Playback Slider.
parent 0a99093a
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 4 deletions
Base.lproj/MainMenu.xib
View file @ 6a424312
......@@ -342,7 +342,7 @@
<toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="1529"/>
<toolbarItem implicitItemIdentifier="NSToolbarSeparatorItem" id="1673"/>
<toolbarItem implicitItemIdentifier="NSToolbarCustomizeToolbarItem" id="1645"/>
<toolbarItem implicitItemIdentifier="A06F7688-72A2-4AAD-B9E1-C66720B2B0D3" label="Playback Control" paletteLabel="Playback Control" sizingBehavior="auto" id="1539">
<toolbarItem implicitItemIdentifier="A06F7688-72A2-4AAD-B9E1-C66720B2B0D3" label="Playback Control" paletteLabel="Playback Control" visibilityPriority="15" sizingBehavior="auto" id="1539">
<nil key="toolTip"/>
<segmentedControl key="view" verticalHuggingPriority="750" id="1537" customClass="PlaybackButtons">
<rect key="frame" x="0.0" y="14" width="133" height="23"/>
......@@ -363,7 +363,7 @@
</connections>
</segmentedControl>
</toolbarItem>
<toolbarItem implicitItemIdentifier="0D05748D-3258-44F5-9D1C-CBF211C15E2D" label="Search" paletteLabel="Search" sizingBehavior="auto" id="1533">
<toolbarItem implicitItemIdentifier="0D05748D-3258-44F5-9D1C-CBF211C15E2D" label="Search" paletteLabel="Search" sizingBehavior="auto" id="1533" customClass="NSSearchToolbarItem">
<nil key="toolTip"/>
<searchField key="view" wantsLayer="YES" verticalHuggingPriority="750" id="1531">
<rect key="frame" x="0.0" y="14" width="79" height="22"/>
......@@ -413,7 +413,7 @@
</searchFieldCell>
</searchField>
</toolbarItem>
<toolbarItem implicitItemIdentifier="2CDD90B4-2355-4E8A-AE42-A6C872DF700A" label="Position" paletteLabel="Position" visibilityPriority="10" sizingBehavior="auto" id="1551">
<toolbarItem implicitItemIdentifier="2CDD90B4-2355-4E8A-AE42-A6C872DF700A" label="Position" paletteLabel="Position" visibilityPriority="10" sizingBehavior="auto" id="1551" customClass="PositionSliderToolbarItem" customModule="Cog" customModuleProvider="target">
<nil key="toolTip"/>
<slider key="view" verticalHuggingPriority="750" id="1549" customClass="PositionSlider">
<rect key="frame" x="0.0" y="14" width="96" height="28"/>
......
Cog.xcodeproj/project.pbxproj
View file @ 6a424312
......@@ -207,6 +207,7 @@
8E9A30160BA792DC0091081B /* NSFileHandle+CreateFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 8E9A30140BA792DC0091081B /* NSFileHandle+CreateFile.m */; };
99EAACA80DD1BB7A00423C38 /* APL.bundle in CopyFiles */ = {isa = PBXBuildFile; fileRef = 566D321B0D538550004466A5 /* APL.bundle */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
B09E96630D74A7BC0064F138 /* stop_current.png in Resources */ = {isa = PBXBuildFile; fileRef = B09E96620D74A7BC0064F138 /* stop_current.png */; };
EDAAA41F25A665C000731773 /* PositionSliderToolbarItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDAAA41E25A665C000731773 /* PositionSliderToolbarItem.swift */; };
F6F96719102C709000D2C9B4 /* NSString+FinderCompare.m in Sources */ = {isa = PBXBuildFile; fileRef = F6F96718102C709000D2C9B4 /* NSString+FinderCompare.m */; };
/* End PBXBuildFile section */
......@@ -980,6 +981,7 @@
8E9A30140BA792DC0091081B /* NSFileHandle+CreateFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFileHandle+CreateFile.m"; sourceTree = "<group>"; };
B09E94300D747F7B0064F138 /* FFMPEG.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = FFMPEG.xcodeproj; path = Plugins/FFMPEG/FFMPEG.xcodeproj; sourceTree = "<group>"; };
B09E96620D74A7BC0064F138 /* stop_current.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = stop_current.png; path = Images/stop_current.png; sourceTree = "<group>"; };
EDAAA41E25A665C000731773 /* PositionSliderToolbarItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PositionSliderToolbarItem.swift; sourceTree = "<group>"; };
F6F96718102C709000D2C9B4 /* NSString+FinderCompare.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+FinderCompare.m"; sourceTree = "<group>"; };
F6F9671A102C70C800D2C9B4 /* NSString+FinderCompare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+FinderCompare.h"; sourceTree = "<group>"; };
/* End PBXFileReference section */
......@@ -1377,6 +1379,7 @@
17E0D5E60F520F02005B6FED /* PositionSlider.m */,
17E0D5E70F520F02005B6FED /* TimeField.h */,
17E0D5E80F520F02005B6FED /* TimeField.m */,
EDAAA41E25A665C000731773 /* PositionSliderToolbarItem.swift */,
);
name = Window;
sourceTree = "<group>";
......@@ -1851,7 +1854,7 @@
LastUpgradeCheck = 1100;
TargetAttributes = {
8D1107260486CEB800E47090 = {
DevelopmentTeam = "";
DevelopmentTeam = RXH4D9SUXM;
LastSwiftMigration = 1220;
ProvisioningStyle = Automatic;
};
......@@ -2340,6 +2343,7 @@
1755E1F90BA0D2B600CA3560 /* PlaylistLoader.m in Sources */,
8E9A30160BA792DC0091081B /* NSFileHandle+CreateFile.m in Sources */,
179790E10C087AB7001D6996 /* OpenURLPanel.m in Sources */,
EDAAA41F25A665C000731773 /* PositionSliderToolbarItem.swift in Sources */,
83790D501809F4980073CF51 /* NSObject+SPInvocationGrabbing.m in Sources */,
1791FF900CB43A2C0070BC5C /* MediaKeysApplication.m in Sources */,
838491211807F38A00E7332D /* NowPlayingBarView.m in Sources */,
......
PositionSliderToolbarItem.swift 0 → 100644
View file @ 6a424312
//
// PositionSliderToolbarItem.swift
// Cog
//
// Created by Dzmitry Neviadomski on 7.01.21.
//
import Cocoa
class PositionSliderToolbarItem: NSToolbarItem {
override var minSize: NSSize{
get {
return NSSize(width: 100, height: 28)
}
set {}
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment