Felix Paul Kühne pushed to branch master at VideoLAN / VLC
Commits:
fbb2b67c by Felix Paul Kühne at 2025-08-17T13:26:00+00:00
macosx: fix controls bar tooltips
- - - - -
4105c28e by Felix Paul Kühne at 2025-08-17T13:26:00+00:00
macosx/play queue: add missing tool tips
- - - - -
6 changed files:
- modules/gui/macosx/UI/VLCLibraryWindowPlayQueueView.xib
- modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.h
- modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.m
- modules/gui/macosx/playqueue/VLCPlayQueueMenuController.m
- modules/gui/macosx/windows/controlsbar/VLCMainVideoViewControlsBar.m
- modules/gui/macosx/windows/controlsbar/VLCMainWindowControlsBar.m
Changes:
=====================================
modules/gui/macosx/UI/VLCLibraryWindowPlayQueueView.xib
=====================================
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"
useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="23094"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="23504"/>
<capability name="System colors introduced in macOS 10.14"
minToolsVersion="10.0"/>
<capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
</dependencies>
@@ -9,11 +9,13 @@
<customObject id="-2" userLabel="File's Owner"
customClass="VLCLibraryWindowPlayQueueSidebarViewController">
<connections>
<outlet property="bottomButtonsSeparator"
destination="ew3-Pn-diG" id="N5L-cw-953"/>
+ <outlet property="clearButton" destination="aKS-lw-hfk"
id="30D-7g-SnA"/>
<outlet property="dragDropImageBackgroundBox"
destination="aUB-Ld-N2o" id="9xc-5h-uRF"/>
<outlet property="dragDropView" destination="grx-kk-1X1"
id="b1W-Zw-a7Z"/>
<outlet property="openMediaButton" destination="ghp-DI-YmZ"
id="30J-m7-gLb"/>
<outlet property="repeatButton" destination="9xU-Ba-Hys"
id="myS-5X-rgK"/>
<outlet property="shuffleButton" destination="bdZ-N9-Noa"
id="bJz-sR-lGW"/>
+ <outlet property="sortButton" destination="C02-6a-1Uw"
id="kfR-K3-lce"/>
<outlet property="tableView" destination="Ubg-RS-LWE"
id="ZiJ-ca-sOj"/>
<outlet property="titleSeparator" destination="ik5-L4-VLw"
id="qht-tq-0rB"/>
<outlet property="view" destination="NJR-gf-yTs"
id="P3C-tn-4va"/>
@@ -22,14 +24,14 @@
<customObject id="-1" userLabel="First Responder"
customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView identifier="VLCLibraryWindowPlayQueueSidebarIdentifier"
id="NJR-gf-yTs">
- <rect key="frame" x="0.0" y="0.0" width="510" height="266"/>
+ <rect key="frame" x="0.0" y="0.0" width="510" height="268"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES"
flexibleMinY="YES"/>
<subviews>
<box verticalHuggingPriority="751" boxType="separator"
translatesAutoresizingMaskIntoConstraints="NO" id="ik5-L4-VLw">
- <rect key="frame" x="20" y="263" width="470" height="5"/>
+ <rect key="frame" x="20" y="265" width="470" height="5"/>
</box>
<scrollView borderType="none" autohidesScrollers="YES"
horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18"
verticalPageScroll="10" hasHorizontalScroller="NO"
usesPredominantAxisScrolling="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="EIb-Is-vco">
- <rect key="frame" x="0.0" y="55" width="510" height="210"/>
+ <rect key="frame" x="0.0" y="57" width="510" height="210"/>
<clipView key="contentView" drawsBackground="NO"
copiesOnScroll="NO" id="20t-S6-IYS">
<rect key="frame" x="0.0" y="0.0" width="510"
height="210"/>
<autoresizingMask key="autoresizingMask"
widthSizable="YES" heightSizable="YES"/>
@@ -95,10 +97,10 @@
</scroller>
</scrollView>
<box verticalHuggingPriority="751" boxType="separator"
translatesAutoresizingMaskIntoConstraints="NO" id="ew3-Pn-diG">
- <rect key="frame" x="20" y="52" width="470" height="5"/>
+ <rect key="frame" x="20" y="54" width="470" height="5"/>
</box>
<customView hidden="YES"
translatesAutoresizingMaskIntoConstraints="NO" id="grx-kk-1X1"
customClass="VLCDragDropView">
- <rect key="frame" x="0.0" y="55" width="510" height="210"/>
+ <rect key="frame" x="0.0" y="57" width="510" height="210"/>
<subviews>
<box boxType="custom" borderType="line"
borderWidth="0.0" cornerRadius="10" titlePosition="noTitle"
translatesAutoresizingMaskIntoConstraints="NO" id="aUB-Ld-N2o">
<rect key="frame" x="188" y="38" width="134"
height="134"/>
@@ -139,7 +141,7 @@
</constraints>
</customView>
<stackView distribution="equalCentering"
orientation="horizontal" alignment="top"
horizontalStackHuggingPriority="249.99998474121094"
verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES"
translatesAutoresizingMaskIntoConstraints="NO" id="hc5-GJ-yJe">
- <rect key="frame" x="20" y="16" width="470" height="22"/>
+ <rect key="frame" x="20" y="16" width="470" height="24"/>
<subviews>
<button verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="bdZ-N9-Noa">
<rect key="frame" x="0.0" y="0.0" width="24"
height="24"/>
=====================================
modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.h
=====================================
@@ -41,6 +41,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (readwrite, weak) IBOutlet NSBox *bottomButtonsSeparator;
@property (readwrite, weak) IBOutlet NSButton *repeatButton;
@property (readwrite, weak) IBOutlet NSButton *shuffleButton;
+@property (readwrite, weak) IBOutlet NSButton *sortButton;
+@property (readwrite, weak) IBOutlet NSButton *clearButton;
@property (readwrite, nonatomic) NSTextField *counterLabel;
=====================================
modules/gui/macosx/library/VLCLibraryWindowPlayQueueSidebarViewController.m
=====================================
@@ -70,6 +70,11 @@
self.openMediaButton.title = _NS("Open media...");
self.dragDropImageBackgroundBox.fillColor =
NSColor.VLClibrarySeparatorLightColor;
+ self.shuffleButton.toolTip = _NS("Shuffle");
+ self.repeatButton.toolTip = _NS("Repeat");
+ self.sortButton.toolTip = _NS("Sort Play Queue");
+ self.clearButton.toolTip = _NS("Clear Play Queue");
+
[self repeatStateUpdated:nil];
[self shuffleStateUpdated:nil];
=====================================
modules/gui/macosx/playqueue/VLCPlayQueueMenuController.m
=====================================
@@ -71,7 +71,7 @@
_playMenuItem = [[NSMenuItem alloc] initWithTitle:_NS("Play")
action:@selector(play:) keyEquivalent:@""];
_playMenuItem.target = self;
- _removeMenuItem = [[NSMenuItem alloc] initWithTitle:_NS("Delete")
action:@selector(remove:) keyEquivalent:@""];
+ _removeMenuItem = [[NSMenuItem alloc] initWithTitle:_NS("Remove from Play
Queue") action:@selector(remove:) keyEquivalent:@""];
_removeMenuItem.target = self;
_revealInFinderMenuItem = [[NSMenuItem alloc] initWithTitle:_NS("Reveal in
Finder") action:@selector(revealInFinder:) keyEquivalent:@""];
@@ -83,11 +83,11 @@
_addFilesToPlayQueueMenuItem = [[NSMenuItem alloc] initWithTitle:_NS("Add
File...") action:@selector(addFilesToPlayQueue:) keyEquivalent:@""];
_addFilesToPlayQueueMenuItem.target = self;
- _clearPlayQueueMenuItem = [[NSMenuItem alloc] initWithTitle:_NS("Clear the
play queue") action:@selector(clearPlayQueue:) keyEquivalent:@""];
+ _clearPlayQueueMenuItem = [[NSMenuItem alloc] initWithTitle:_NS("Clear
Play Queue") action:@selector(clearPlayQueue:) keyEquivalent:@""];
_clearPlayQueueMenuItem.target = self;
_playQueueSortingMenuController = [[VLCPlayQueueSortingMenuController
alloc] init];
- _sortMenuItem = [[NSMenuItem alloc] initWithTitle:_NS("Sort") action:nil
keyEquivalent:@""];
+ _sortMenuItem = [[NSMenuItem alloc] initWithTitle:_NS("Sort Play Queue")
action:nil keyEquivalent:@""];
[_sortMenuItem
setSubmenu:_playQueueSortingMenuController.playQueueSortingMenu];
self.items = @[
=====================================
modules/gui/macosx/windows/controlsbar/VLCMainVideoViewControlsBar.m
=====================================
@@ -58,18 +58,24 @@
self.bookmarksButton.toolTip = _NS("Bookmarks");
self.bookmarksButton.accessibilityLabel = self.bookmarksButton.toolTip;
- self.subtitlesButton.toolTip = _NS("Subtitle settings");
+ self.subtitlesButton.toolTip = _NS("Subtitles");
self.subtitlesButton.accessibilityLabel = self.subtitlesButton.toolTip;
- self.audioButton.toolTip = _NS("Audio settings");
+ self.audioButton.toolTip = _NS("Audio");
self.audioButton.accessibilityLabel = self.audioButton.toolTip;
- self.videoButton.toolTip = _NS("Video settings");
+ self.videoButton.toolTip = _NS("Video");
self.videoButton.accessibilityLabel = self.videoButton.toolTip;
- self.playbackRateButton.toolTip = _NS("Playback rate");
+ self.playbackRateButton.toolTip = _NS("Playback Rate");
self.playbackRateButton.accessibilityLabel =
self.playbackRateButton.toolTip;
+ self.floatOnTopButton.toolTip = _NS("Float on Top");
+ self.floatOnTopButton.accessibilityLabel = self.floatOnTopButton.toolTip;
+
+ self.pipButton.toolTip = _NS("Picture in Picture");
+ self.pipButton.accessibilityLabel = self.pipButton.toolTip;
+
if (@available(macOS 26.0, *)) {
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 260000
_mainButtonsSymbolConfig = [NSImageSymbolConfiguration
configurationWithPaletteColors:@[NSColor.whiteColor]];
=====================================
modules/gui/macosx/windows/controlsbar/VLCMainWindowControlsBar.m
=====================================
@@ -226,6 +226,7 @@
VLCMediaLibraryMediaItem * const currentMlItem =
_playerController.currentMediaLibraryItem;
self.favoriteButton.hidden = currentMlItem == nil;
self.favoriteButton.state = currentMlItem.favorited ?
NSControlStateValueOn : NSControlStateValueOff;
+ self.favoriteButton.toolTip = currentMlItem.favorited ? _NS("Unmark as
Favorite") : _NS("Mark as Favorite");
}
- (void)toggleFavorite:(id)sender
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/87b4b49ea3c6ffaa2029669ca4debd4a35981a08...4105c28e5d283d6ebd77c0539f26354912454f1b
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/87b4b49ea3c6ffaa2029669ca4debd4a35981a08...4105c28e5d283d6ebd77c0539f26354912454f1b
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
