Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
fefeb403 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Remove coney from toolbar
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
1b9803fb by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Move toolbar setup out of VLCLibraryAudioViewController and into
VLCLibraryWindow
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
c68ad252 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Move toolbar setup out of VLCLibraryVideoViewController and into
VLCLibraryWindow
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
fa909f20 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Move toolbar setup out of VLCLibraryMediaSourceControlelr and into
VLCLibraryWindow
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
7b8a7cf2 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Hide backwards and forwards buttons in toolbar outside of media source
views
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
4e449fe4 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Disable customisation of the library window toolbar
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
feefc324 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Add IBOutlets in library window for toolbar items
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
e540ed81 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Hide and display backwards and forwards nav buttons depending on
current view segment by removing and re-adding to toolbar
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
44a6d6ee by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Properly hide sort order toolbar item by removing from toolbar
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
ee8392ec by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Simplify sort order toolbar item insertion and make it reusable
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
8015cc11 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Simplify setForwardsBackwardsToolbarItemsVisible in VLCLibraryWindow
using insertToolbarItem:inFrontOf:
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
2bdb0788 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Hide library search field when in media source views instead of just
disabling it
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
60b3b835 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Remove unused toolbar spacer item
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
e8eb0069 by Claudio Cambra at 2023-02-04T06:29:50+00:00
macosx: Limit the width of the search field to something more reasonable
Signed-off-by: Claudio Cambra <develo...@claudiocambra.com>
- - - - -
9 changed files:
- modules/gui/macosx/UI/VLCLibraryWindow.xib
- modules/gui/macosx/library/VLCLibraryWindow.h
- modules/gui/macosx/library/VLCLibraryWindow.m
- modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.h
- modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m
- modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.h
- modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.m
- modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.h
- modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.m
Changes:
=====================================
modules/gui/macosx/UI/VLCLibraryWindow.xib
=====================================
@@ -588,7 +588,7 @@
<constraint firstAttribute="bottom"
secondItem="vUy-jt-gjY" secondAttribute="bottom" id="vMr-VQ-r4P"/>
</constraints>
</visualEffectView>
- <toolbar key="toolbar"
implicitIdentifier="CAE4F278-DC20-4A58-B07E-1580E7B14C87"
centeredItem="KnW-Lr-R1d" autosavesConfiguration="NO" displayMode="iconOnly"
sizeMode="regular" id="pr3-TD-J2z"
customClass="VLCLibraryWindowAutohideToolbar">
+ <toolbar key="toolbar"
implicitIdentifier="CAE4F278-DC20-4A58-B07E-1580E7B14C87"
centeredItem="KnW-Lr-R1d" autosavesConfiguration="NO"
allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular"
id="pr3-TD-J2z" customClass="VLCLibraryWindowAutohideToolbar">
<allowedToolbarItems>
<toolbarItem
implicitItemIdentifier="71EED6C9-B0A2-4964-8846-16159F10619E" label="Sort
Order" paletteLabel="Sort Order" image="arrow.up.arrow.down" catalog="system"
sizingBehavior="auto" id="Tbc-Ik-FaO">
<nil key="toolTip"/>
@@ -641,11 +641,6 @@
</segmentedControl>
</toolbarItem>
<toolbarItem
implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="89f-AL-zuU"/>
- <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem"
id="hs0-cc-34q"/>
- <toolbarItem
implicitItemIdentifier="FCCB897D-45D4-411A-91BF-302620882C8C" label="smallCone"
paletteLabel="Toolbar Cone" tag="-1" image="VLC" navigational="YES"
id="L28-Xw-ydE">
- <size key="minSize" width="512" height="512"/>
- <size key="maxSize" width="512" height="512"/>
- </toolbarItem>
<toolbarItem
implicitItemIdentifier="85037E27-D263-490C-B4B2-0EFE5B5837AA" label="Library
View Type" paletteLabel="Library View Type" sizingBehavior="auto"
id="kBa-MC-Mdq">
<nil key="toolTip"/>
<segmentedControl key="view"
verticalHuggingPriority="750" id="lIg-5J-C5F">
@@ -662,9 +657,11 @@
</toolbarItem>
<searchToolbarItem
implicitItemIdentifier="A132890F-6B3D-4523-A71B-B00F095057C4" label="Search"
paletteLabel="Search" visibilityPriority="1001" id="dv4-Il-y8X">
<nil key="toolTip"/>
- <searchField key="view" verticalHuggingPriority="750"
textCompletion="NO" id="ab6-kR-8Io">
- <rect key="frame" x="0.0" y="0.0" width="100"
height="21"/>
- <autoresizingMask key="autoresizingMask"/>
+ <searchField key="view" verticalHuggingPriority="750"
textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO"
id="ab6-kR-8Io">
+ <rect key="frame" x="0.0" y="0.0" width="100"
height="22"/>
+ <constraints>
+ <constraint firstAttribute="width"
relation="lessThanOrEqual" constant="200" id="hhF-2O-Qx7"/>
+ </constraints>
<searchFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
refusesFirstResponder="YES" sendsActionOnEndEditing="YES" borderStyle="bezel"
usesSingleLineMode="YES" bezelStyle="round" sendsSearchStringImmediately="YES"
id="MW6-rQ-Qtr">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -705,7 +702,6 @@
</toolbarItem>
</allowedToolbarItems>
<defaultToolbarItems>
- <toolbarItem reference="L28-Xw-ydE"/>
<toolbarItem reference="6Ie-eu-GDn"/>
<toolbarItem reference="g2e-7o-Qet"/>
<toolbarItem reference="kBa-MC-Mdq"/>
@@ -735,17 +731,21 @@
<outlet property="audioLibraryView" destination="lpg-UW-pTq"
id="FYD-PV-Ce2"/>
<outlet property="audioSegmentedControl"
destination="8iI-b7-Eag" id="ERG-nc-ziq"/>
<outlet property="backwardsNavigationButton"
destination="Bzq-ZV-i8j" id="Bac-Kb-ut"/>
+ <outlet property="backwardsToolbarItem"
destination="6Ie-eu-GDn" id="q3s-rt-8gy"/>
<outlet property="clearPlaylistButton"
destination="cih-xp-HmY" id="PoU-co-0kn"/>
<outlet property="clearPlaylistSeparator"
destination="nAW-KH-ipk" id="Af9-fg-u7m"/>
<outlet property="controlsBar" destination="Uzf-Tf-H8x"
id="n0G-92-F2Q"/>
<outlet property="dragDropImageBackgroundBox"
destination="AXk-h7-dZ0" id="h3h-Wh-0op"/>
<outlet property="emptyLibraryView" destination="YJf-1r-vaC"
id="AJB-eN-4u6"/>
+ <outlet property="flexibleSpaceToolbarItem"
destination="89f-AL-zuU" id="3p9-t8-79g"/>
<outlet property="forwardsNavigationButton"
destination="jzy-je-h2k" id="for-Wa-rd"/>
+ <outlet property="forwardsToolbarItem"
destination="g2e-7o-Qet" id="3qp-rg-t2P"/>
<outlet property="gridVsListSegmentedControl"
destination="lIg-5J-C5F" id="u6B-Zx-4mX"/>
<outlet property="librarySearchField" destination="ab6-kR-8Io"
id="Qf7-UM-lol"/>
<outlet property="librarySearchToolbarItem"
destination="dv4-Il-y8X" id="Um3-s4-Ax4"/>
<outlet property="librarySortButton" destination="Rja-6g-wNZ"
id="FQ7-MU-hsk"/>
<outlet property="libraryTargetView" destination="iSp-bV-w6B"
id="a94-ux-wUc"/>
+ <outlet property="libraryViewModeToolbarItem"
destination="kBa-MC-Mdq" id="q39-28-tyf"/>
<outlet property="mainSplitView" destination="u8g-jy-S4e"
id="lI5-wR-kef"/>
<outlet property="mediaSourceCollectionView"
destination="r7v-GI-W1U" id="3JJ-GU-o5o"/>
<outlet property="mediaSourceCollectionViewScrollView"
destination="cFG-c9-cI9" id="QQq-Ql-uQ7"/>
@@ -769,6 +769,8 @@
<outlet property="segmentedTitleControl"
destination="W1M-0o-qYG" id="Gw1-T6-78k"/>
<outlet property="segmentedTitleControlToolbarItem"
destination="KnW-Lr-R1d" id="Wg1-Y2-34a"/>
<outlet property="shufflePlaylistButton"
destination="jg5-33-vH0" id="FV2-36-3lG"/>
+ <outlet property="sortOrderToolbarItem"
destination="Tbc-Ik-FaO" id="098-yp-97f"/>
+ <outlet property="togglePlaylistToolbarItem"
destination="Lf2-ec-tHh" id="gtf-cd-765"/>
<outlet property="upNextLabel" destination="TET-5r-zHx"
id="3oI-LK-NDP"/>
<outlet property="upNextSeparator" destination="qmL-Ar-cj1"
id="GRX-ZE-2UG"/>
<outlet property="videoLibraryCollectionViewsStackView"
destination="y8S-p5-jaq" id="c01-v1-eW3"/>
=====================================
modules/gui/macosx/library/VLCLibraryWindow.h
=====================================
@@ -56,7 +56,6 @@ extern const CGFloat VLCLibraryWindowMinimalHeight;
extern const NSUserInterfaceItemIdentifier VLCLibraryWindowIdentifier;
@property (readwrite, weak) IBOutlet NSSegmentedControl *segmentedTitleControl;
-@property (readwrite, weak) IBOutlet NSToolbarItem
*segmentedTitleControlToolbarItem;
@property (readwrite, weak) IBOutlet NSSegmentedControl
*gridVsListSegmentedControl;
@property (readwrite, weak) IBOutlet NSSplitView *mainSplitView;
@property (readwrite, strong) IBOutlet NSView *playlistView;
@@ -108,11 +107,18 @@ extern const NSUserInterfaceItemIdentifier
VLCLibraryWindowIdentifier;
@property (readwrite, weak) IBOutlet VLCRoundedCornerTextField
*playlistCounterTextField;
@property (readwrite, weak) IBOutlet NSButton *librarySortButton;
@property (readwrite, weak) IBOutlet NSSearchField *librarySearchField;
-@property (readwrite, weak) IBOutlet NSToolbarItem *librarySearchToolbarItem;
@property (readwrite, weak) IBOutlet NSButton *playQueueToggle;
@property (readwrite, weak) IBOutlet NSButton *backwardsNavigationButton;
@property (readwrite, weak) IBOutlet NSButton *forwardsNavigationButton;
@property (readwrite, weak) IBOutlet NSButton *artworkButton;
+@property (readwrite, weak) IBOutlet NSToolbarItem *backwardsToolbarItem;
+@property (readwrite, weak) IBOutlet NSToolbarItem *forwardsToolbarItem;
+@property (readwrite, weak) IBOutlet NSToolbarItem *libraryViewModeToolbarItem;
+@property (readwrite, weak) IBOutlet NSToolbarItem *sortOrderToolbarItem;
+@property (readwrite, weak) IBOutlet NSToolbarItem *flexibleSpaceToolbarItem;
+@property (readwrite, weak) IBOutlet NSToolbarItem
*segmentedTitleControlToolbarItem;
+@property (readwrite, weak) IBOutlet NSToolbarItem *librarySearchToolbarItem;
+@property (readwrite, weak) IBOutlet NSToolbarItem *togglePlaylistToolbarItem;
@property (nonatomic, readwrite, strong) IBOutlet NSView *emptyLibraryView;
@property (nonatomic, readwrite, strong) IBOutlet NSImageView
*placeholderImageView;
=====================================
modules/gui/macosx/library/VLCLibraryWindow.m
=====================================
@@ -135,6 +135,8 @@ static void addShadow(NSImageView *__unsafe_unretained
imageView)
self.tabbingMode = NSWindowTabbingModeDisallowed;
}
+ self.toolbar.allowsUserCustomization = NO;
+
VLCMain *mainInstance = [VLCMain sharedInstance];
_playlistController = [mainInstance playlistController];
@@ -479,7 +481,8 @@ static void addShadow(NSImageView *__unsafe_unretained
imageView)
_currentSelectedSegment = _segmentedTitleControl.selectedSegment;
_currentSelectedViewModeSegment =
_gridVsListSegmentedControl.selectedSegment;
- switch (_segmentedTitleControl.selectedSegment) {
+ VLCLibrarySegment selectedLibrarySegment =
_segmentedTitleControl.selectedSegment;
+ switch (selectedLibrarySegment) {
case VLCLibraryVideoSegment:
[self showVideoLibrary];
break;
@@ -487,10 +490,8 @@ static void addShadow(NSImageView *__unsafe_unretained
imageView)
[self showAudioLibrary];
break;
case VLCLibraryBrowseSegment:
- [_libraryMediaSourceViewController presentBrowseView];
- break;
case VLCLibraryStreamsSegment:
- [_libraryMediaSourceViewController presentStreamsView];
+ [self showMediaSourceLibraryWithSegment:selectedLibrarySegment];
break;
default:
break;
@@ -512,20 +513,128 @@ static void addShadow(NSImageView *__unsafe_unretained
imageView)
}
}
+- (void)hideToolbarItem:(NSToolbarItem *)toolbarItem
+{
+ NSInteger toolbarItemIndex = [[self.toolbar items]
indexOfObject:toolbarItem];
+ if (toolbarItemIndex != NSNotFound) {
+ [self.toolbar removeItemAtIndex:toolbarItemIndex];
+ }
+}
+
+/*
+ * Try to insert the toolbar item ahead of a group of possible toolbar items.
+ * "items" should contain items sorted from the trailing edge of the toolbar
to leading edge.
+ * "toolbarItem" will be inserted as close to the trailing edge as possible.
+ *
+ * If you have: | item1 | item2 | item3 | item4 |
+ * and the "items" parameter is an array containing @[item6, item5, item2,
item1]
+ * then the "toolbarItem" provided to this function will place toolbarItem
thus:
+ * | item1 | item2 | toolbarItem | item3 | item4 |
+*/
+
+- (void)insertToolbarItem:(NSToolbarItem *)toolbarItem
inFrontOf:(NSArray<NSToolbarItem *> *)items
+{
+ NSParameterAssert(toolbarItem != nil && items != nil &&
toolbarItem.itemIdentifier.length > 0);
+
+ NSInteger toolbarItemIndex = [[self.toolbar items]
indexOfObject:toolbarItem];
+ if (toolbarItemIndex != NSNotFound) {
+ return;
+ }
+
+ for (NSToolbarItem *item in items) {
+ NSInteger itemIndex = [[self.toolbar items] indexOfObject:item];
+
+ if (itemIndex != NSNotFound) {
+ [self.toolbar
insertItemWithItemIdentifier:toolbarItem.itemIdentifier atIndex:itemIndex + 1];
+ return;
+ }
+ }
+
+ [self.toolbar insertItemWithItemIdentifier:toolbarItem.itemIdentifier
atIndex:0];
+}
+
+- (void)setForwardsBackwardsToolbarItemsVisible:(BOOL)visible
+{
+ if (!visible) {
+ [self hideToolbarItem:_forwardsToolbarItem];
+ [self hideToolbarItem:_backwardsToolbarItem];
+ return;
+ }
+
+ [self insertToolbarItem:_backwardsToolbarItem inFrontOf:@[]];
+ [self insertToolbarItem:_forwardsToolbarItem
inFrontOf:@[_backwardsToolbarItem]];
+}
+
+- (void)setSortOrderToolbarItemVisible:(BOOL)visible
+{
+ if (!visible) {
+ [self hideToolbarItem:_sortOrderToolbarItem];
+ return;
+ }
+
+ [self insertToolbarItem:_sortOrderToolbarItem
+ inFrontOf:@[_libraryViewModeToolbarItem,
_forwardsToolbarItem, _backwardsToolbarItem]];
+}
+
+- (void)setLibrarySearchToolbarItemVisible:(BOOL)visible
+{
+ if (!visible) {
+ [self hideToolbarItem:_librarySearchToolbarItem];
+ _librarySearchField.stringValue = @"";
+ [VLCMain.sharedInstance.libraryController filterByString:@""];
+ return;
+ }
+
+ // Display as far to the right as possible, but not in front of the
playlist toggle button
+ NSMutableArray<NSToolbarItem *> *currentToolbarItems = [NSMutableArray
arrayWithArray:self.toolbar.items];
+ if (currentToolbarItems.lastObject == _togglePlaylistToolbarItem) {
+ [currentToolbarItems removeLastObject];
+ }
+
+ NSArray *reversedCurrentToolbarItems = [[currentToolbarItems
reverseObjectEnumerator] allObjects];
+ [self insertToolbarItem:_librarySearchToolbarItem
inFrontOf:reversedCurrentToolbarItems];
+}
+
- (void)showVideoLibrary
{
- [_libraryVideoViewController presentVideoView];
+ [self setForwardsBackwardsToolbarItemsVisible:NO];
+ [self setSortOrderToolbarItemVisible:YES];
+ [self setLibrarySearchToolbarItemVisible:YES];
+ _optionBarView.hidden = YES;
- self.gridVsListSegmentedControl.target = self;
- self.gridVsListSegmentedControl.action =
@selector(segmentedControlAction:);
+ _gridVsListSegmentedControl.target = self;
+ _gridVsListSegmentedControl.action = @selector(segmentedControlAction:);
+
+ [_libraryVideoViewController presentVideoView];
}
- (void)showAudioLibrary
{
+ [self setForwardsBackwardsToolbarItemsVisible:NO];
+ [self setSortOrderToolbarItemVisible:YES];
+ [self setLibrarySearchToolbarItemVisible:YES];
+ _optionBarView.hidden = NO;
+
+ _gridVsListSegmentedControl.target = self;
+ _gridVsListSegmentedControl.action = @selector(segmentedControlAction:);
+
[_libraryAudioViewController presentAudioView];
+}
+
+- (void)showMediaSourceLibraryWithSegment:(VLCLibrarySegment)segment
+{
+ NSParameterAssert(segment == VLCLibraryBrowseSegment || segment ==
VLCLibraryStreamsSegment);
+
+ [self setForwardsBackwardsToolbarItemsVisible:YES];
+ [self setSortOrderToolbarItemVisible:NO];
+ [self setLibrarySearchToolbarItemVisible:NO];
+ _optionBarView.hidden = YES;
- self.gridVsListSegmentedControl.target = self;
- self.gridVsListSegmentedControl.action =
@selector(segmentedControlAction:);
+ if (segment == VLCLibraryBrowseSegment) {
+ [_libraryMediaSourceViewController presentBrowseView];
+ } else if (segment == VLCLibraryStreamsSegment) {
+ [_libraryMediaSourceViewController presentStreamsView];
+ }
}
- (IBAction)playlistDoubleClickAction:(id)sender
=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.h
=====================================
@@ -50,9 +50,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (readonly) NSSegmentedControl *audioSegmentedControl;
@property (readonly) NSSegmentedControl *gridVsListSegmentedControl;
@property (readonly) NSSegmentedControl *segmentedTitleControl;
-@property (readonly) NSButton *librarySortButton;
-@property (readonly) NSSearchField *librarySearchField;
-@property (readonly) NSVisualEffectView *optionBarView;
@property (readonly) NSImageView *placeholderImageView;
@property (readonly) NSTextField *placeholderLabel;
@property (readonly) NSView *emptyLibraryView;
=====================================
modules/gui/macosx/library/audio-library/VLCLibraryAudioViewController.m
=====================================
@@ -103,9 +103,6 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier =
@"VLCLibraryPlaceholderAudi
_audioSegmentedControl = libraryWindow.audioSegmentedControl;
_gridVsListSegmentedControl = libraryWindow.gridVsListSegmentedControl;
_segmentedTitleControl = libraryWindow.segmentedTitleControl;
- _optionBarView = libraryWindow.optionBarView;
- _librarySortButton = libraryWindow.librarySortButton;
- _librarySearchField = libraryWindow.librarySearchField;
_placeholderImageView = libraryWindow.placeholderImageView;
_placeholderLabel = libraryWindow.placeholderLabel;
_emptyLibraryView = libraryWindow.emptyLibraryView;
@@ -222,11 +219,6 @@ NSString *VLCLibraryPlaceholderAudioViewIdentifier =
@"VLCLibraryPlaceholderAudi
[self configureAudioSegmentedControl];
[self
segmentedControlAction:VLCMain.sharedInstance.libraryWindow.navigationStack];
-
- _librarySortButton.hidden = NO;
- _librarySearchField.enabled = YES;
- _optionBarView.hidden = NO;
- _audioSegmentedControl.hidden = NO;
}
- (void)presentPlaceholderAudioView
=====================================
modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.h
=====================================
@@ -38,9 +38,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (readonly) NSButton *homeButton;
@property (readonly) NSPathControl *pathControl;
@property (readonly) NSSegmentedControl *gridVsListSegmentedControl;
-@property (readonly) NSButton *librarySortButton;
-@property (readonly) NSSearchField *librarySearchField;
-@property (readonly) NSVisualEffectView *optionBarView;
@property (readonly) VLCMediaSourceBaseDataSource *baseDataSource;
=====================================
modules/gui/macosx/library/media-source/VLCLibraryMediaSourceViewController.m
=====================================
@@ -55,10 +55,6 @@
_homeButton = libraryWindow.mediaSourceHomeButton;
_pathControl = libraryWindow.mediaSourcePathControl;
_gridVsListSegmentedControl = libraryWindow.gridVsListSegmentedControl;
- _optionBarView = libraryWindow.optionBarView;
- _librarySortButton = libraryWindow.librarySortButton;
- _librarySearchField = libraryWindow.librarySearchField;
-
}
- (void)setupBaseDataSource
@@ -101,13 +97,6 @@
}
_baseDataSource.mediaSourceMode = viewSegment == VLCLibraryBrowseSegment ?
VLCMediaSourceModeLAN : VLCMediaSourceModeInternet;
-
- _librarySortButton.hidden = YES;
- _librarySearchField.enabled = NO;
- _librarySearchField.stringValue = @"";
- [VLCMain.sharedInstance.libraryController filterByString:@""];
- _optionBarView.hidden = YES;
-
[_baseDataSource reloadViews];
}
=====================================
modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.h
=====================================
@@ -44,9 +44,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (readonly) NSTableView *videoLibraryGroupsTableView;
@property (readonly) NSSegmentedControl *gridVsListSegmentedControl;
@property (readonly) NSSegmentedControl *segmentedTitleControl;
-@property (readonly) NSButton *librarySortButton;
-@property (readonly) NSSearchField *librarySearchField;
-@property (readonly) NSVisualEffectView *optionBarView;
@property (readonly) NSImageView *placeholderImageView;
@property (readonly) NSTextField *placeholderLabel;
@property (readonly) NSView *emptyLibraryView;
=====================================
modules/gui/macosx/library/video-library/VLCLibraryVideoViewController.m
=====================================
@@ -73,9 +73,6 @@
_gridVsListSegmentedControl = libraryWindow.gridVsListSegmentedControl;
_segmentedTitleControl = libraryWindow.segmentedTitleControl;
- _optionBarView = libraryWindow.optionBarView;
- _librarySortButton = libraryWindow.librarySortButton;
- _librarySearchField = libraryWindow.librarySearchField;
_placeholderImageView = libraryWindow.placeholderImageView;
_placeholderLabel = libraryWindow.placeholderLabel;
_emptyLibraryView = libraryWindow.emptyLibraryView;
@@ -133,12 +130,7 @@
- (void)presentVideoView
{
_libraryTargetView.subviews = @[];
-
[self updatePresentedView];
-
- _librarySortButton.hidden = NO;
- _librarySearchField.enabled = YES;
- _optionBarView.hidden = YES;
}
- (void)presentPlaceholderVideoLibraryView
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/2d3c2254d7202b304096deb8f35757aa73cf0445...e8eb00699626a71ea5f42c8820a760f01d865069
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/2d3c2254d7202b304096deb8f35757aa73cf0445...e8eb00699626a71ea5f42c8820a760f01d865069
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
