diff options
| author | Bradley Sepos <[email protected]> | 2018-03-17 17:36:40 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-03-17 17:36:40 -0400 |
| commit | 3fd13833711dc4bb4aac8987e63442870bda4c4b (patch) | |
| tree | 300769bc00c1bb22ca3b18e560a0033428b02cee /macosx | |
| parent | d1a3d95ee19797180a88e3013015c9f1696a6429 (diff) | |
MacGUI: Fix Rename dialog on 10.7.
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/English.lproj/MainMenu.xib | 2 | ||||
| -rw-r--r-- | macosx/HBController.m | 7 | ||||
| -rw-r--r-- | macosx/HBRenamePresetController.m | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index 75274b917..334be1526 100644 --- 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 70ec14bad..9985d3c80 100644 --- 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 be87fe002..2b788da32 100644 --- 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:) |