Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
9472b775 by Claudio Cambra at 2024-06-07T03:20:07+00:00
macosx: Add checkbox beside MRL field in information window
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
cc06be8b by Claudio Cambra at 2024-06-07T03:20:07+00:00
macosx: Ensure location text field does not force the information window to be
too wide
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
aaef35d1 by Claudio Cambra at 2024-06-07T03:20:07+00:00
macosx: Update displayed location on decoded checkbox toggle in information
window
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
e7da436f by Claudio Cambra at 2024-06-07T03:20:07+00:00
macosx: Convert checkbox for decoded/encoded to copy button
Signed-off-by: Claudio Cambra <[email protected]>
- - - - -
3 changed files:
- modules/gui/macosx/UI/VLCInformationWindow.xib
- modules/gui/macosx/panels/VLCInformationWindowController.h
- modules/gui/macosx/panels/VLCInformationWindowController.m
Changes:
=====================================
modules/gui/macosx/UI/VLCInformationWindow.xib
=====================================
@@ -59,6 +59,7 @@
<outlet property="lostAudioBuffersTextField" destination="578"
id="695"/>
<outlet property="lostFramesLabel" destination="559" id="696"/>
<outlet property="lostFramesTextField" destination="560"
id="697"/>
+ <outlet property="mrlCopyButton" destination="mC1-pf-fRU"
id="aal-CO-3Tz"/>
<outlet property="nowPlayingLabel" destination="477" id="667"/>
<outlet property="nowPlayingTextField" destination="476"
id="668"/>
<outlet property="outlineView" destination="519" id="683"/>
@@ -124,8 +125,8 @@
<color key="backgroundColor"
name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField focusRingType="none"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="509" customClass="VLCSettingTextField">
- <rect key="frame" x="37" y="18"
width="468" height="19"/>
+ <textField focusRingType="none"
horizontalHuggingPriority="251" verticalHuggingPriority="750"
horizontalCompressionResistancePriority="250"
translatesAutoresizingMaskIntoConstraints="NO" id="509"
customClass="VLCSettingTextField">
+ <rect key="frame" x="37" y="18"
width="416" height="19"/>
<constraints>
<constraint
firstAttribute="height" constant="19" id="POw-kc-CJg"/>
</constraints>
@@ -443,17 +444,28 @@
</textField>
<button
translatesAutoresizingMaskIntoConstraints="NO" id="9jw-Fr-d1M">
<rect key="frame" x="345" y="129"
width="160" height="128"/>
- <constraints>
- <constraint
firstAttribute="height" constant="128" id="sbu-BX-HX7"/>
- </constraints>
<buttonCell key="cell"
type="square" bezelStyle="shadowlessSquare" image="noart" imagePosition="only"
alignment="center" imageScaling="proportionallyUpOrDown" inset="2"
id="T6o-O9-fdd">
<behavior key="behavior"
pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font"
metaFont="system"/>
</buttonCell>
+ <constraints>
+ <constraint
firstAttribute="height" constant="128" id="sbu-BX-HX7"/>
+ </constraints>
<connections>
<action
selector="chooseArtwork:" target="-2" id="aoX-w0-3xf"/>
</connections>
</button>
+ <button
horizontalHuggingPriority="252" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="mC1-pf-fRU">
+ <rect key="frame" x="441" y="18"
width="64" height="19"/>
+ <buttonCell key="cell"
type="roundRect" title="Copy" bezelStyle="roundedRect" imagePosition="trailing"
alignment="center" state="on" borderStyle="border" inset="2" id="VR0-15-bEV">
+ <behavior key="behavior"
pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font"
metaFont="cellTitle"/>
+ <imageReference key="image"
image="arrow.right.doc.on.clipboard" catalog="system" symbolScale="small"/>
+ </buttonCell>
+ <connections>
+ <action selector="copyMrl:"
target="-2" id="WOa-yv-wo3"/>
+ </connections>
+ </button>
</subviews>
<constraints>
<constraint firstItem="32r-kK-YIK"
firstAttribute="centerY" secondItem="NFO-5i-C2y" secondAttribute="centerY"
id="1fr-ua-HLh"/>
@@ -465,6 +477,7 @@
<constraint firstItem="435"
firstAttribute="top" secondItem="436" secondAttribute="bottom" constant="3"
id="5A4-pd-kbP"/>
<constraint firstItem="463"
firstAttribute="leading" secondItem="461" secondAttribute="trailing"
constant="8" id="5fW-BF-CQQ"/>
<constraint firstAttribute="trailing"
secondItem="435" secondAttribute="trailing" constant="37" id="5sT-kX-Mgh"/>
+ <constraint firstItem="509"
firstAttribute="trailing" secondItem="mC1-pf-fRU" secondAttribute="leading"
constant="-8" id="64p-sq-S98"/>
<constraint firstItem="435"
firstAttribute="leading" secondItem="431" secondAttribute="trailing"
constant="8" id="69n-nP-QoU"/>
<constraint firstItem="439"
firstAttribute="top" secondItem="440" secondAttribute="bottom" constant="3"
id="71b-yF-M2B"/>
<constraint firstItem="9jw-Fr-d1M"
firstAttribute="bottom" secondItem="486" secondAttribute="bottom"
id="77b-m1-E2f"/>
@@ -525,7 +538,6 @@
<constraint firstItem="cXh-Kb-cBh"
firstAttribute="baseline" secondItem="8ES-YK-OvS" secondAttribute="baseline"
id="bXf-GW-PkM"/>
<constraint firstItem="8ES-YK-OvS"
firstAttribute="leading" secondItem="tWC-Zr-8E5" secondAttribute="leading"
id="bg2-9d-Pz1"/>
<constraint firstItem="504"
firstAttribute="top" secondItem="505" secondAttribute="bottom" constant="3"
id="cNI-ci-of3"/>
- <constraint firstItem="509"
firstAttribute="trailing" secondItem="427" secondAttribute="trailing"
id="cSo-Kc-YyT"/>
<constraint firstItem="481"
firstAttribute="leading" secondItem="422" secondAttribute="leading"
constant="37" id="cT2-6b-0aP"/>
<constraint firstItem="Cro-Nn-BBH"
firstAttribute="centerY" secondItem="Vvu-VZ-aui" secondAttribute="centerY"
id="dwC-lc-i68"/>
<constraint firstItem="504"
firstAttribute="trailing" secondItem="412" secondAttribute="trailing"
id="e5v-Xe-fX8"/>
@@ -536,6 +548,7 @@
<constraint firstItem="477"
firstAttribute="top" secondItem="461" secondAttribute="bottom" constant="8"
symbolic="YES" id="g6g-Ns-JmP"/>
<constraint firstItem="487"
firstAttribute="trailing" secondItem="498" secondAttribute="trailing"
id="gE5-M8-JCo"/>
<constraint firstItem="D3W-el-Mmk"
firstAttribute="trailing" secondItem="Ken-fu-rsj" secondAttribute="trailing"
id="gJK-xx-0fy"/>
+ <constraint firstAttribute="trailing"
secondItem="mC1-pf-fRU" secondAttribute="trailing" constant="37"
id="gcK-U6-TdJ"/>
<constraint firstItem="9jw-Fr-d1M"
firstAttribute="width" secondItem="463" secondAttribute="width"
id="gsO-On-Rim"/>
<constraint firstAttribute="trailing"
secondItem="510" secondAttribute="trailing" constant="34" id="hlm-Bz-jEa"/>
<constraint firstItem="441"
firstAttribute="leading" secondItem="463" secondAttribute="leading"
id="ikh-TH-cNg"/>
@@ -547,6 +560,7 @@
<constraint firstItem="462"
firstAttribute="top" secondItem="tWC-Zr-8E5" secondAttribute="bottom"
constant="8" id="nzo-th-CDt"/>
<constraint firstItem="431"
firstAttribute="width" secondItem="439" secondAttribute="width"
id="oAX-uN-IMI"/>
<constraint firstItem="D3W-el-Mmk"
firstAttribute="leading" secondItem="32r-kK-YIK" secondAttribute="leading"
id="oPJ-zE-OzO"/>
+ <constraint firstItem="mC1-pf-fRU"
firstAttribute="centerY" secondItem="509" secondAttribute="centerY"
id="odQ-Gk-fU2"/>
<constraint firstItem="476"
firstAttribute="top" secondItem="477" secondAttribute="bottom" constant="3"
id="p8W-42-Rnu"/>
<constraint firstItem="487"
firstAttribute="top" secondItem="497" secondAttribute="bottom" constant="8"
id="pMt-4R-J9m"/>
<constraint firstItem="462"
firstAttribute="leading" secondItem="461" secondAttribute="leading"
id="pU7-gV-qZe"/>
@@ -1110,6 +1124,7 @@
</window>
</objects>
<resources>
+ <image name="arrow.right.doc.on.clipboard" catalog="system" width="14"
height="15"/>
<image name="noart" width="128" height="128"/>
</resources>
</document>
=====================================
modules/gui/macosx/panels/VLCInformationWindowController.h
=====================================
@@ -33,6 +33,7 @@
@property (readwrite, weak) IBOutlet NSOutlineView *outlineView;
@property (readwrite, weak) IBOutlet NSSegmentedControl *segmentedView;
+@property (readwrite, weak) IBOutlet NSButton *mrlCopyButton;
@property (readwrite, weak) IBOutlet NSTextField *decodedMRLLabel;
@property (readwrite, weak) IBOutlet NSTextField *titleLabel;
@property (readwrite, weak) IBOutlet VLCSettingTextField *decodedMRLTextField;
@@ -112,6 +113,7 @@
@property (readwrite) BOOL mainMenuInstance;
- (IBAction)toggleWindow:(id)sender;
+- (IBAction)copyMrl:(id)sender;
- (IBAction)saveMetaData:(id)sender;
- (IBAction)chooseArtwork:(id)sender;
=====================================
modules/gui/macosx/panels/VLCInformationWindowController.m
=====================================
@@ -231,6 +231,13 @@ _##field##TextField.delegate = self
}
}
+- (IBAction)copyMrl:(id)sender
+{
+ NSPasteboard * const pasteboard = NSPasteboard.generalPasteboard;
+ [pasteboard clearContents];
+ [pasteboard setString:self.representedInputItems.firstObject.MRL
forType:NSPasteboardTypeString];
+}
+
- (void)initMediaPanelStats
{
//Initializing Input Variables
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/5ffd36ffa26a83ae498373f7d0ace1d82ab952f4...e7da436f09692301af78d37ded42187e613a5030
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/5ffd36ffa26a83ae498373f7d0ace1d82ab952f4...e7da436f09692301af78d37ded42187e613a5030
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
