Skip to content

V
vlc-gpu
Commit 60b06277 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: fixed minor display issue with the Equalizer button (#4654)

parent 6d98ddf3
Show whitespace changes
Inline Side-by-side
Showing with 15857 additions and 15869 deletions
extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib
View file @ 60b06277
......@@ -3,42 +3,16 @@
<data>
<int key="IBDocument.SystemTarget">1040</int>
<string key="IBDocument.SystemVersion">11A419</string>
<string key="IBDocument.InterfaceBuilderVersion">1530</string>
<string key="IBDocument.InterfaceBuilderVersion">851</string>
<string key="IBDocument.AppKitVersion">1115.2</string>
<string key="IBDocument.HIToolboxVersion">549.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">1530</string>
<string key="NS.object.0">851</string>
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSTextView</string>
<string>NSScroller</string>
<string>NSMenu</string>
<string>NSSliderCell</string>
<string>NSButton</string>
<string>NSTableHeaderView</string>
<string>NSCustomObject</string>
<string>NSImageView</string>
<string>NSSlider</string>
<string>NSCustomView</string>
<string>NSImageCell</string>
<string>NSSearchField</string>
<string>NSTextField</string>
<string>NSSearchFieldCell</string>
<string>NSWindowTemplate</string>
<string>NSTextFieldCell</string>
<string>NSStepperCell</string>
<string>NSButtonCell</string>
<string>NSTableColumn</string>
<string>NSOutlineView</string>
<string>NSView</string>
<string>NSPopUpButtonCell</string>
<string>NSScrollView</string>
<string>NSProgressIndicator</string>
<string>NSPopUpButton</string>
<string>NSStepper</string>
<string>NSMenuItem</string>
<integer value="2"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -68,6 +42,7 @@
<string key="NSWindowClass">VLCControllerWindow</string>
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="429932428">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
......@@ -86,7 +61,7 @@
<object class="NSFont" key="NSSupport" id="188716167">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">10</double>
<int key="NSfFlags">2843</int>
<int key="NSfFlags">2832</int>
</object>
<reference key="NSControlView" ref="809192538"/>
<int key="NSButtonFlags">138674431</int>
......@@ -308,11 +283,11 @@
</object>
</object>
</object>
<string key="NSFrame">{{7, 11}, {338, 29}}</string>
<string key="NSFrameSize">{338, 29}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSFrameAutosaveName">vlc</string>
</object>
<object class="NSMenu" id="782168084">
......@@ -1728,6 +1703,7 @@
<characters key="NS.bytes">View</characters>
</object>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSWindowContentMinSize">{599, 368}</string>
<object class="NSView" key="NSWindowView" id="584094047">
<nil key="NSNextResponder"/>
......@@ -1747,7 +1723,7 @@
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
<int key="NSfFlags">3088</int>
</object>
<reference key="NSControlView" ref="23828214"/>
<int key="NSButtonFlags">-2038284033</int>
......@@ -1800,7 +1776,7 @@
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">67119975</int>
<int key="NSFlags">100674407</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<object class="NSColor" key="NSBackgroundColor" id="208330917">
......@@ -1935,7 +1911,7 @@
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMinSize">{599, 384}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSFrameAutosaveName">messages</string>
</object>
<object class="NSMenu" id="966937735">
......@@ -2181,6 +2157,7 @@
<characters key="NS.bytes">View</characters>
</object>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="810171395">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
......@@ -2954,7 +2931,7 @@
<string key="NSFrame">{{1, 9}, {410, 192}}</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSFrameAutosaveName">equalizer</string>
</object>
<object class="NSCustomObject" id="783121973">
......@@ -3260,7 +3237,7 @@
<object class="NSFont" key="NSSupport" id="841513812">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
<int key="NSfFlags">1040</int>
</object>
<reference key="NSControlView" ref="596740638"/>
<bool key="NSDrawsBackground">YES</bool>
......@@ -3390,8 +3367,9 @@
<characters key="NS.bytes">View</characters>
</object>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="351701434">
<reference key="NSNextResponder"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
......@@ -3400,7 +3378,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{39, 4}, {39, 20}}</string>
<reference key="NSSuperview" ref="351701434"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="551367224">
<int key="NSCellFlags">67239424</int>
......@@ -3433,7 +3410,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{7, 4}, {31, 20}}</string>
<reference key="NSSuperview" ref="351701434"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1038165577">
<int key="NSCellFlags">67763712</int>
......@@ -3464,7 +3440,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{79, 4}, {31, 20}}</string>
<reference key="NSSuperview" ref="351701434"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="401765054">
<int key="NSCellFlags">67763712</int>
......@@ -3507,7 +3482,6 @@
</object>
<string key="NSFrame">{{158, 4}, {57, 20}}</string>
<reference key="NSSuperview" ref="351701434"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="936178023">
<int key="NSCellFlags">130560</int>
......@@ -3528,7 +3502,6 @@
<int key="NSvFlags">290</int>
<string key="NSFrame">{{158, 6}, {17, 15}}</string>
<reference key="NSSuperview" ref="351701434"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="295635233">
<int key="NSCellFlags">67501824</int>
......@@ -3553,7 +3526,6 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{114, 4}, {33, 20}}</string>
<reference key="NSSuperview" ref="351701434"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="641689162">
<int key="NSCellFlags">67239424</int>
......@@ -3596,7 +3568,6 @@
</object>
<string key="NSFrame">{{152, 4}, {8, 20}}</string>
<reference key="NSSuperview" ref="351701434"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="259149746">
<int key="NSCellFlags">130560</int>
......@@ -3629,7 +3600,6 @@
</object>
<string key="NSFrame">{{210, 4}, {8, 20}}</string>
<reference key="NSSuperview" ref="351701434"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="1033378443">
<int key="NSCellFlags">130560</int>
......@@ -3650,7 +3620,6 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{172, 7}, {46, 13}}</string>
<reference key="NSSuperview" ref="351701434"/>
<reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="742071211">
<int key="NSCellFlags">-2079195584</int>
......@@ -3670,17 +3639,14 @@
<int key="NSvFlags">274</int>
<string key="NSFrame">{{0, 28}, {238, 35}}</string>
<reference key="NSSuperview" ref="351701434"/>
<reference key="NSWindow"/>
<string key="NSClassName">VLCEmbeddedVoutView</string>
<string key="NSExtension">NSView</string>
</object>
</object>
<string key="NSFrame">{{7, 11}, {238, 63}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<string key="NSFrameAutosaveName">embeddedvoutwindow</string>
</object>
<object class="NSWindowTemplate" id="442533115">
......@@ -3696,6 +3662,7 @@
<characters key="NS.bytes">View</characters>
</object>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="500944643">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
......@@ -3714,7 +3681,7 @@
<object class="NSFont" key="NSSupport" id="103182952">
<string key="NSName">LucidaGrande-Bold</string>
<double key="NSSize">13</double>
<int key="NSfFlags">2072</int>
<int key="NSfFlags">2064</int>
</object>
<reference key="NSControlView" ref="855729941"/>
<reference key="NSBackgroundColor" ref="3414043"/>
......@@ -3821,7 +3788,7 @@
<string key="NSFrame">{{1, 9}, {249, 103}}</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
</object>
<object class="NSCustomView" id="356649608">
<nil key="NSNextResponder"/>
......@@ -4064,6 +4031,7 @@
<characters key="NS.bytes">View</characters>
</object>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="985395477">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
......@@ -4457,7 +4425,7 @@
<string key="NSFrameSize">{549, 87}</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
</object>
<object class="NSCustomView" id="191392701">
<nil key="NSNextResponder"/>
......@@ -4719,6 +4687,7 @@
<characters key="NS.bytes">View</characters>
</object>
<nil key="NSUserInterfaceItemIdentifier"/>
<string key="NSWindowContentMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
<object class="NSView" key="NSWindowView" id="366395044">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
......@@ -4827,7 +4796,7 @@ LCAuLi4</string>
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">67121123</int>
<int key="NSFlags">100675555</int>
<int key="NSTextCheckingTypes">0</int>
<nil key="NSMarkedAttributes"/>
<reference key="NSBackgroundColor" ref="712893775"/>
......@@ -4988,7 +4957,7 @@ LCAuLi4</string>
<string key="NSFrameSize">{612, 324}</string>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<string key="NSMaxSize">{1.7976931348623157e+308, 1.7976931348623157e+308}</string>
</object>
<object class="NSCustomObject" id="1040926652">
<string key="NSClassName">SUUpdater</string>
......@@ -7965,6 +7934,14 @@ LCAuLi4</string>
</object>
<int key="connectionID">4404</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">o_btn_equalizer</string>
<reference key="source" ref="783121973"/>
<reference key="destination" ref="38046606"/>
</object>
<int key="connectionID">4405</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
......@@ -11627,6 +11604,8 @@ LCAuLi4</string>
<string>2808.ImportedFromIB2</string>
<string>282.IBPluginDependency</string>
<string>282.ImportedFromIB2</string>
<string>282.windowTemplate.hasMinSize</string>
<string>282.windowTemplate.minSize</string>
<string>2825.IBPluginDependency</string>
<string>2825.ImportedFromIB2</string>
<string>283.IBPluginDependency</string>
......@@ -12450,6 +12429,8 @@ LCAuLi4</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<boolean value="YES"/>
<string>{599, 368}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
......@@ -12778,16 +12759,20 @@ LCAuLi4</string>
<object class="NSMutableDictionary" key="unlocalizedProperties">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<nil key="activeLocalization"/>
<object class="NSMutableDictionary" key="localizations">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference key="dict.sortedKeys" ref="0"/>
<reference key="dict.values" ref="0"/>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">4404</int>
<int key="maxID">4405</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -15758,6 +15743,7 @@ LCAuLi4</string>
<integer value="3000" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<nil key="IBDocument.LastKnownRelativeProjectPath"/>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<bool key="EncodedWithXMLCoder">YES</bool>
......
modules/gui/macosx/equalizer.h
View file @ 60b06277
......@@ -27,7 +27,6 @@
@interface VLCEqualizer : NSObject
{
IBOutlet id o_btn_equalizer;
IBOutlet id o_btn_equalizer_embedded;
IBOutlet id o_ckb_2pass;
IBOutlet id o_ckb_enable;
IBOutlet id o_fld_preamp;
......
modules/gui/macosx/equalizer.m
View file @ 60b06277
......@@ -142,7 +142,6 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
{
int i;
[o_btn_equalizer setToolTip: _NS("Equalizer")];
[o_btn_equalizer_embedded setToolTip: _NS("Equalizer")];
[o_ckb_2pass setTitle: _NS("2 Pass")];
[o_ckb_2pass setToolTip: _NS("Apply the "
"equalizer filter twice. The effect will be sharper.")];
......@@ -330,13 +329,11 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
{
[o_window orderOut:sender];
[o_btn_equalizer setState:NSOffState];
[o_btn_equalizer_embedded setState:NSOffState];
}
else
{
[o_window makeKeyAndOrderFront:sender];
[o_btn_equalizer setState:NSOnState];
[o_btn_equalizer_embedded setState:NSOnState];
}
}
......@@ -363,6 +360,12 @@ static bool GetFiltersStatus( intf_thread_t *p_intf,
vlc_object_release( p_object );
}
- (void)windowDidBecomeKey:(NSNotification *)aNotification
{
[o_btn_equalizer setState: NSOnState];
}
- (void)windowWillClose:(NSNotification *)aNotification
{
[o_btn_equalizer setState: NSOffState];
......
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