MacGui: remove the built in presets update alert.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7185 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/English.lproj/Preferences.xib b/macosx/English.lproj/Preferences.xib
index d68b90d3cd26d190da9b18d219d47efa49eff5df..7243893fc2da21f5bb208a77cb02c613a33c45ed 100644 (file)
--- a/macosx/English.lproj/Preferences.xib
+++ b/macosx/English.lproj/Preferences.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7515.2" systemVersion="14D72i" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="7702" systemVersion="14E17e" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1060" identifier="macosx"/>
         <development version="5100" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7515.2"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7702"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HBPreferencesController">
@@ -382,11 +382,11 @@
             <point key="canvasLocation" x="-82" y="-791"/>
         </customView>
         <customView id="236" userLabel="Advanced">
-            <rect key="frame" x="0.0" y="-5" width="500" height="308"/>
+            <rect key="frame" x="0.0" y="5" width="500" height="262"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <popUpButton verticalHuggingPriority="750" id="363">
-                    <rect key="frame" x="218" y="101" width="66" height="22"/>
+                    <rect key="frame" x="218" y="55" width="66" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <popUpButtonCell key="cell" type="push" title="1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="369" id="364">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -404,7 +404,7 @@
                     </connections>
                 </popUpButton>
                 <popUpButton verticalHuggingPriority="750" id="387">
-                    <rect key="frame" x="337" y="267" width="76" height="22"/>
+                    <rect key="frame" x="337" y="221" width="76" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <popUpButtonCell key="cell" type="push" title="0.25" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="391" id="388">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -426,19 +426,8 @@
                         <binding destination="61" name="selectedValue" keyPath="values.x264CqSliderFractional" id="397"/>
                     </connections>
                 </popUpButton>
-                <button id="401">
-                    <rect key="frame" x="125" y="17" width="339" height="18"/>
-                    <autoresizingMask key="autoresizingMask"/>
-                    <buttonCell key="cell" type="check" title="Alert when updating built-in presets" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="402">
-                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
-                        <font key="font" metaFont="smallSystem"/>
-                    </buttonCell>
-                    <connections>
-                        <binding destination="61" name="value" keyPath="values.AlertBuiltInPresetUpdate" id="403"/>
-                    </connections>
-                </button>
                 <button id="398">
-                    <rect key="frame" x="125" y="138" width="339" height="18"/>
+                    <rect key="frame" x="125" y="92" width="339" height="18"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <buttonCell key="cell" type="check" title="Use libdvdnav (instead of libdvdread)" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="399">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -449,7 +438,7 @@
                     </connections>
                 </button>
                 <button id="347">
-                    <rect key="frame" x="125" y="83" width="340" height="18"/>
+                    <rect key="frame" x="125" y="37" width="340" height="18"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <buttonCell key="cell" type="check" title="Put individual encode logs in same location as movie" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="348">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -460,7 +449,7 @@
                     </connections>
                 </button>
                 <textField verticalHuggingPriority="750" id="442">
-                    <rect key="frame" x="18" y="140" width="104" height="14"/>
+                    <rect key="frame" x="18" y="94" width="104" height="14"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="DVD-Video:" id="443">
                         <font key="font" metaFont="smallSystem"/>
@@ -469,7 +458,7 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" id="IV7-SY-HLR">
-                    <rect key="frame" x="18" y="213" width="104" height="14"/>
+                    <rect key="frame" x="18" y="167" width="104" height="14"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Scan:" id="c0L-TU-WML">
                         <font key="font" metaFont="smallSystem"/>
@@ -478,7 +467,7 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" id="jPa-4p-Y29">
-                    <rect key="frame" x="18" y="272" width="104" height="14"/>
+                    <rect key="frame" x="18" y="226" width="104" height="14"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="x264:" id="cqp-xU-GOe">
                         <font key="font" metaFont="smallSystem"/>
@@ -487,7 +476,7 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" id="350">
-                    <rect key="frame" x="18" y="106" width="104" height="14"/>
+                    <rect key="frame" x="18" y="60" width="104" height="14"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Log:" id="351">
                         <font key="font" metaFont="smallSystem"/>
@@ -496,7 +485,7 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" id="371">
-                    <rect key="frame" x="120" y="106" width="95" height="14"/>
+                    <rect key="frame" x="120" y="60" width="95" height="14"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Verbosity Level:" id="372">
                         <font key="font" metaFont="smallSystem"/>
@@ -505,7 +494,7 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" id="359">
-                    <rect key="frame" x="92" y="189" width="230" height="14"/>
+                    <rect key="frame" x="92" y="143" width="230" height="14"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Number of picture previews to scan:" id="360">
                         <font key="font" metaFont="smallSystem"/>
@@ -514,7 +503,7 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" id="463">
-                    <rect key="frame" x="118" y="213" width="179" height="14"/>
+                    <rect key="frame" x="118" y="167" width="179" height="14"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Minimum length of title to scan:" id="464">
                         <font key="font" metaFont="smallSystem"/>
@@ -523,7 +512,7 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" id="UXr-op-aKN">
-                    <rect key="frame" x="356" y="213" width="77" height="14"/>
+                    <rect key="frame" x="356" y="167" width="77" height="14"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="seconds" id="klQ-DW-Kc6">
                         <font key="font" metaFont="smallSystem"/>
@@ -532,7 +521,7 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" id="395">
-                    <rect key="frame" x="118" y="272" width="216" height="14"/>
+                    <rect key="frame" x="118" y="226" width="216" height="14"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Constant Quality fractional granularity:" id="396">
                         <font key="font" metaFont="smallSystem"/>
@@ -541,7 +530,7 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" id="480">
-                    <rect key="frame" x="303" y="211" width="48" height="19"/>
+                    <rect key="frame" x="303" y="165" width="48" height="19"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="481">
                         <font key="font" metaFont="smallSystem"/>
@@ -553,7 +542,7 @@
                     </connections>
                 </textField>
                 <button id="ybi-46-yhY">
-                    <rect key="frame" x="125" y="247" width="286" height="20"/>
+                    <rect key="frame" x="125" y="201" width="286" height="20"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <buttonCell key="cell" type="check" title="Show Advanced Encoder Options Tab" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="Du1-9x-nHn">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -563,22 +552,15 @@
                         <binding destination="61" name="value" keyPath="values.HBShowAdvancedTab" id="PgA-TV-kBr"/>
                     </connections>
                 </button>
-                <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="NGW-RG-tnZ">
-                    <rect key="frame" x="20" y="46" width="460" height="5"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                    <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
-                    <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                    <font key="titleFont" metaFont="system"/>
-                </box>
                 <box verticalHuggingPriority="750" title="Box" boxType="separator" titlePosition="noTitle" id="I0V-hM-Fq0">
-                    <rect key="frame" x="20" y="168" width="460" height="5"/>
+                    <rect key="frame" x="20" y="122" width="460" height="5"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <font key="titleFont" metaFont="system"/>
                 </box>
                 <popUpButton verticalHuggingPriority="750" id="352">
-                    <rect key="frame" x="325" y="184" width="73" height="22"/>
+                    <rect key="frame" x="325" y="138" width="73" height="22"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="353">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -620,7 +602,7 @@
                     </connections>
                 </popUpButton>
                 <button id="Ndp-Xh-ohY">
-                    <rect key="frame" x="125" y="63" width="340" height="18"/>
+                    <rect key="frame" x="125" y="17" width="340" height="18"/>
                     <autoresizingMask key="autoresizingMask"/>
                     <buttonCell key="cell" type="check" title="Clear logs older than 30 days" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="lgn-RF-k0d">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -631,7 +613,7 @@
                     </connections>
                 </button>
             </subviews>
-            <point key="canvasLocation" x="-82" y="-62"/>
+            <point key="canvasLocation" x="-82" y="-85"/>
         </customView>
         <customObject id="410" userLabel="Updater" customClass="SUUpdater"/>
     </objects>

diff --git a/macosx/HBAppDelegate.m b/macosx/HBAppDelegate.m
index 39f6671ea786af06b2cdba98f1db953320d77efc..33b82c315fcf6ad8a41ada2d66535b4187d2f3d7 100644 (file)
--- a/macosx/HBAppDelegate.m
+++ b/macosx/HBAppDelegate.m
@@ -281,23 +281,6 @@
 
 #pragma mark - Presets Menu actions
 
-- (void)checkBuiltInsForUpdates
-{
-    // if we have built in presets to update, then do so AlertBuiltInPresetUpdate
-    //if ([self.presetsManager checkBuiltInsForUpdates])
-    //{
-    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"AlertBuiltInPresetUpdate"] == YES)
-        {
-            // Show an alert window that built in presets will be updated
-            [NSApp requestUserAttention:NSCriticalRequest];
-            NSAlert *alert = [[NSAlert alloc] init];
-            [alert setMessageText:@"HandBrake has determined your built in presets are out of date…"];
-            [alert setInformativeText:@"HandBrake will now update your built-in presets."];
-            [alert runModal];
-        }
-    //}
-}
-
 /**
  *  Adds the presets list to the menu.
  */

diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index 2419efd066bfc08ddd1bf8fa2aecd5e04fde9302..55847acf2dd8472402826cd32f0a83e5394d5ac9 100644 (file)
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -75,7 +75,6 @@
         @"MinTitleScanSeconds":             @"10",
         @"PreviewsNumber":                  @"10",
         @"x264CqSliderFractional":          @"0.50",
-        @"AlertBuiltInPresetUpdate":        @"YES",
         @"SendCompletedEncodeToApp":        @"MetaX",
         @"HBShowAdvancedTab":               @NO,
         @"HBAutoNamingFormat":              @[@"{Source}", @" ", @"{Title}"],