[vlc-commits] macOS: Rename VLCPopUpButtonCell to VLCHUDPopUpButtonCell
Marvin Scholz
git at videolan.org
Sat Jun 24 10:32:49 CEST 2017
vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Sat Jun 24 10:07:40 2017 +0200| [4dd9bce4be40ddca4b91831c6da271626777dc42] | committer: Marvin Scholz
macOS: Rename VLCPopUpButtonCell to VLCHUDPopUpButtonCell
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4dd9bce4be40ddca4b91831c6da271626777dc42
---
extras/package/macosx/VLC.xcodeproj/project.pbxproj | 12 ++++++------
modules/gui/macosx/Makefile.am | 2 +-
modules/gui/macosx/UI/AudioEffects.xib | 4 ++--
modules/gui/macosx/UI/VideoEffects.xib | 10 +++++-----
.../macosx/{VLCPopUpButtonCell.h => VLCHUDPopUpButtonCell.h} | 4 ++--
.../macosx/{VLCPopUpButtonCell.m => VLCHUDPopUpButtonCell.m} | 6 +++---
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index ae423362ac..ab72d48e82 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -75,7 +75,7 @@
6B4D50931E7979CB004479B5 /* VLCSimplePrefsWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B4D50921E7979CB004479B5 /* VLCSimplePrefsWindow.m */; };
6B4D50961E7A7D16004479B5 /* NSSound+VLCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B4D50951E7A7D16004479B5 /* NSSound+VLCAdditions.m */; };
6B4D50A71E7AB52C004479B5 /* NSScreen+VLCAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B4D50A61E7AB52C004479B5 /* NSScreen+VLCAdditions.m */; };
- 6B5978C51EFBFBF2003D9C80 /* VLCPopUpButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B5978C41EFBFBF2003D9C80 /* VLCPopUpButtonCell.m */; };
+ 6B5978C51EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B5978C41EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.m */; };
6B6FFF701EF9EC350001CEB1 /* CompatibilityFixes.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B6FFF6F1EF9EC350001CEB1 /* CompatibilityFixes.m */; };
6B8166291EBFC34300C26F1B /* VLCDefaultValueSlider.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B6A499B1DFD9B23009128AC /* VLCDefaultValueSlider.m */; };
6B81662A1EBFC34300C26F1B /* VLCDefaultValueSliderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B6A499D1DFD9B23009128AC /* VLCDefaultValueSliderCell.m */; };
@@ -131,8 +131,8 @@
6B4D50951E7A7D16004479B5 /* NSSound+VLCAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSSound+VLCAdditions.m"; sourceTree = "<group>"; };
6B4D50A51E7AB52C004479B5 /* NSScreen+VLCAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSScreen+VLCAdditions.h"; sourceTree = "<group>"; };
6B4D50A61E7AB52C004479B5 /* NSScreen+VLCAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSScreen+VLCAdditions.m"; sourceTree = "<group>"; };
- 6B5978C31EFBFBF2003D9C80 /* VLCPopUpButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCPopUpButtonCell.h; sourceTree = "<group>"; };
- 6B5978C41EFBFBF2003D9C80 /* VLCPopUpButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCPopUpButtonCell.m; sourceTree = "<group>"; };
+ 6B5978C31EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCHUDPopUpButtonCell.h; sourceTree = "<group>"; };
+ 6B5978C41EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCHUDPopUpButtonCell.m; sourceTree = "<group>"; };
6B6A499A1DFD9B23009128AC /* VLCDefaultValueSlider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCDefaultValueSlider.h; sourceTree = "<group>"; };
6B6A499B1DFD9B23009128AC /* VLCDefaultValueSlider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCDefaultValueSlider.m; sourceTree = "<group>"; };
6B6A499C1DFD9B23009128AC /* VLCDefaultValueSliderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCDefaultValueSliderCell.h; sourceTree = "<group>"; };
@@ -1607,8 +1607,8 @@
children = (
6B846FE91CF5DBFF00112E54 /* VLCHUDTextFieldCell.h */,
6B846FEA1CF5DBFF00112E54 /* VLCHUDTextFieldCell.m */,
- 6B5978C31EFBFBF2003D9C80 /* VLCPopUpButtonCell.h */,
- 6B5978C41EFBFBF2003D9C80 /* VLCPopUpButtonCell.m */,
+ 6B5978C31EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.h */,
+ 6B5978C41EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.m */,
6B846FDC1CF5D88C00112E54 /* VLCHUDButtonCell.h */,
6B846FDD1CF5D88C00112E54 /* VLCHUDButtonCell.m */,
6B846FDE1CF5D88C00112E54 /* VLCHUDCheckboxCell.h */,
@@ -1922,7 +1922,7 @@
1C3113BC1E508C6900D4DD76 /* VLCKeyboardBacklightControl.m in Sources */,
1C3113BD1E508C6900D4DD76 /* macosx.m in Sources */,
1C3113BF1E508C6900D4DD76 /* VLCMainMenu.m in Sources */,
- 6B5978C51EFBFBF2003D9C80 /* VLCPopUpButtonCell.m in Sources */,
+ 6B5978C51EFBFBF2003D9C80 /* VLCHUDPopUpButtonCell.m in Sources */,
1C3113C11E508C6900D4DD76 /* VLCMainWindow.m in Sources */,
1C3113C31E508C6900D4DD76 /* VLCMainWindowTitleView.m in Sources */,
1C3113C51E508C6900D4DD76 /* misc.m in Sources */,
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 72a2b5292e..4165e2e971 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -83,7 +83,7 @@ libmacosx_plugin_la_SOURCES = \
gui/macosx/VLCHUDTableHeaderCell.h gui/macosx/VLCHUDTableHeaderCell.m \
gui/macosx/VLCHUDSegmentedCell.h gui/macosx/VLCHUDSegmentedCell.m \
gui/macosx/VLCHUDStepperCell.h gui/macosx/VLCHUDStepperCell.m \
- gui/macosx/VLCPopUpButtonCell.h gui/macosx/VLCPopUpButtonCell.m \
+ gui/macosx/VLCHUDPopUpButtonCell.h gui/macosx/VLCHUDPopUpButtonCell.m \
gui/macosx/VLCInputManager.h gui/macosx/VLCInputManager.m \
gui/macosx/VLCMainWindow.h gui/macosx/VLCMainWindow.m \
gui/macosx/VLCRendererDiscovery.h gui/macosx/VLCRendererDiscovery.m \
diff --git a/modules/gui/macosx/UI/AudioEffects.xib b/modules/gui/macosx/UI/AudioEffects.xib
index be48798d77..bbc5d09dcc 100644
--- a/modules/gui/macosx/UI/AudioEffects.xib
+++ b/modules/gui/macosx/UI/AudioEffects.xib
@@ -242,7 +242,7 @@
<popUpButton verticalHuggingPriority="750" id="168">
<rect key="frame" x="196" y="156" width="155" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <popUpButtonCell key="cell" type="push" title="headphones" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="181" id="169" customClass="VLCPopUpButtonCell">
+ <popUpButtonCell key="cell" type="push" title="headphones" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="181" id="169" customClass="VLCHUDPopUpButtonCell">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
<menu key="menu" title="OtherViews" id="170">
@@ -869,7 +869,7 @@
<popUpButton verticalHuggingPriority="750" id="701">
<rect key="frame" x="110" y="6" width="190" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="706" id="702" customClass="VLCPopUpButtonCell">
+ <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="706" id="702" customClass="VLCHUDPopUpButtonCell">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
<menu key="menu" title="OtherViews" id="703">
diff --git a/modules/gui/macosx/UI/VideoEffects.xib b/modules/gui/macosx/UI/VideoEffects.xib
index e9894feae9..1cf02e15f1 100644
--- a/modules/gui/macosx/UI/VideoEffects.xib
+++ b/modules/gui/macosx/UI/VideoEffects.xib
@@ -680,7 +680,7 @@
<constraints>
<constraint firstAttribute="width" constant="266" id="P89-PX-ceT"/>
</constraints>
- <popUpButtonCell key="cell" type="push" title="Rotate by 90 degrees" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="196" id="194" customClass="VLCPopUpButtonCell">
+ <popUpButtonCell key="cell" type="push" title="Rotate by 90 degrees" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="196" id="194" customClass="VLCHUDPopUpButtonCell">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
<menu key="menu" title="OtherViews" id="195">
@@ -1030,7 +1030,7 @@
<subviews>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="187">
<rect key="frame" x="92" y="54" width="80" height="22"/>
- <popUpButtonCell key="cell" type="push" title="Gradient" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="190" id="188" customClass="VLCPopUpButtonCell">
+ <popUpButtonCell key="cell" type="push" title="Gradient" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="190" id="188" customClass="VLCHUDPopUpButtonCell">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
<menu key="menu" title="OtherViews" id="189">
@@ -1576,7 +1576,7 @@
</textField>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="325">
<rect key="frame" x="103" y="10" width="190" height="22"/>
- <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="328" id="326" customClass="VLCPopUpButtonCell">
+ <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="328" id="326" customClass="VLCHUDPopUpButtonCell">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
<menu key="menu" title="OtherViews" id="327">
@@ -1683,7 +1683,7 @@
</slider>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="692">
<rect key="frame" x="103" y="32" width="190" height="22"/>
- <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="697" id="693" customClass="VLCPopUpButtonCell">
+ <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="697" id="693" customClass="VLCHUDPopUpButtonCell">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
<menu key="menu" title="OtherViews" id="694">
@@ -1751,7 +1751,7 @@
</tabView>
<popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="720">
<rect key="frame" x="287" y="6" width="68" height="22"/>
- <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="723" id="721" customClass="VLCPopUpButtonCell">
+ <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="723" id="721" customClass="VLCHUDPopUpButtonCell">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
<menu key="menu" title="OtherViews" id="722">
diff --git a/modules/gui/macosx/VLCPopUpButtonCell.h b/modules/gui/macosx/VLCHUDPopUpButtonCell.h
similarity index 96%
rename from modules/gui/macosx/VLCPopUpButtonCell.h
rename to modules/gui/macosx/VLCHUDPopUpButtonCell.h
index 54c5043a91..23aeb31b12 100644
--- a/modules/gui/macosx/VLCPopUpButtonCell.h
+++ b/modules/gui/macosx/VLCHUDPopUpButtonCell.h
@@ -1,5 +1,5 @@
//
-// VLCPopUpButtonCell.h
+// VLCHUDPopUpButtonCell.h
// BGHUDAppKit
//
// Created by BinaryGod on 5/31/08.
@@ -34,7 +34,7 @@
#import <Cocoa/Cocoa.h>
- at interface VLCPopUpButtonCell : NSPopUpButtonCell
+ at interface VLCHUDPopUpButtonCell : NSPopUpButtonCell
@property NSShadow *dropShadow;
diff --git a/modules/gui/macosx/VLCPopUpButtonCell.m b/modules/gui/macosx/VLCHUDPopUpButtonCell.m
similarity index 99%
rename from modules/gui/macosx/VLCPopUpButtonCell.m
rename to modules/gui/macosx/VLCHUDPopUpButtonCell.m
index fa979def43..b7248cf655 100644
--- a/modules/gui/macosx/VLCPopUpButtonCell.m
+++ b/modules/gui/macosx/VLCHUDPopUpButtonCell.m
@@ -1,5 +1,5 @@
//
-// VLCPopUpButtonCell.m
+// VLCHUDPopUpButtonCell.m
// BGHUDAppKit
//
// Created by BinaryGod on 5/31/08.
@@ -32,9 +32,9 @@
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
-#import "VLCPopUpButtonCell.h"
+#import "VLCHUDPopUpButtonCell.h"
- at implementation VLCPopUpButtonCell
+ at implementation VLCHUDPopUpButtonCell
- (instancetype)initWithCoder:(NSCoder *)coder
{
More information about the vlc-commits
mailing list