MacGUI: Fix Rename dialog on 10.7.

diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index 75274b917bf7d97b40588df5f27c9a1fbd5cef53..334be1526ae6d7f72f204d24a69ab55102eb8f6d 100644 (file)
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -350,7 +350,7 @@
                             </menuItem>
                             <menuItem title="Rename Preset…" tag="-1" id="1GQ-n3-jfY">
                                 <connections>
-                                    <action selector="renamePreset:" target="-1" id="ts9-w0-2WC"/>
+                                    <action selector="showRenamePresetPanel:" target="-1" id="gRr-Jl-kZO"/>
                                 </connections>
                             </menuItem>
                             <menuItem title="Delete Preset" tag="-1" id="CN3-Rh-gVf">

diff --git a/macosx/HBController.m b/macosx/HBController.m
index 70ec14bad73dc03d4c645997c3779baedca775e8..9985d3c80cd2d4b9eab291beea943e1b488b9616 100644 (file)
--- a/macosx/HBController.m
+++ b/macosx/HBController.m
@@ -1517,6 +1517,7 @@
 - (IBAction)showRenamePresetPanel:(id)sender
 {
     [self.window HB_endEditing];
+    fPresetsView.selectedPreset = _currentPreset;
 
     HBRenamePresetController *renamePresetController = [[HBRenamePresetController alloc] initWithPreset:self.currentPreset
                                                                                           presetManager:presetManager];
@@ -1563,12 +1564,6 @@
     [fPresetsView setDefault:sender];
 }
 
-- (IBAction)renamePreset:(id)sender
-{
-    fPresetsView.selectedPreset = _currentPreset;
-    [self showRenamePresetPanel:sender];
-}
-
 - (IBAction)deletePreset:(id)sender
 {
     HBPreset *preset = [sender representedObject];

diff --git a/macosx/HBRenamePresetController.m b/macosx/HBRenamePresetController.m
index be87fe00232c6321c17f7df385d112261c3fe78f..2b788da328b7431f31b94e459a10b6c03ff1c427 100644 (file)
--- a/macosx/HBRenamePresetController.m
+++ b/macosx/HBRenamePresetController.m
@@ -41,7 +41,11 @@
 {
     [super windowDidLoad];
 
-    self.name.stringValue = self.name.placeholderString = self.preset.name;
+    if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_9)
+    {
+        self.name.placeholderString = self.preset.name;
+    }
+    self.name.stringValue = self.preset.name;
 
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(controlTextDidChange:)