Skip to content

Commit

Permalink
Removed MB preference pane
Browse files Browse the repository at this point in the history
  • Loading branch information
sbooth committed Feb 29, 2020
1 parent d35fec3 commit 2be8f11
Show file tree
Hide file tree
Showing 11 changed files with 3 additions and 1,547 deletions.
8 changes: 0 additions & 8 deletions Preferences/Defaults/MusicBrainzDefaults.plist

This file was deleted.

25 changes: 0 additions & 25 deletions Preferences/MusicBrainzPreferencesController.h

This file was deleted.

31 changes: 0 additions & 31 deletions Preferences/MusicBrainzPreferencesController.m

This file was deleted.

3 changes: 1 addition & 2 deletions Preferences/PreferencesController.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -22,7 +22,6 @@ extern NSString * GeneralPreferencesToolbarItemIdentifier;
extern NSString * FormatsPreferencesToolbarItemIdentifier;
extern NSString * OutputPreferencesToolbarItemIdentifier;
extern NSString * RipperPreferencesToolbarItemIdentifier;
extern NSString * MusicBrainzPreferencesToolbarItemIdentifier;
extern NSString * TaggingPreferencesToolbarItemIdentifier;
extern NSString * AlbumArtPreferencesToolbarItemIdentifier;
extern NSString * iTunesPreferencesToolbarItemIdentifier;
Expand Down
19 changes: 2 additions & 17 deletions Preferences/PreferencesController.m
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005 - 2007 Stephen F. Booth <[email protected]>
* Copyright (C) 2005 - 2020 Stephen F. Booth <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -26,7 +26,6 @@
NSString *FormatsPreferencesToolbarItemIdentifier = @"org.sbooth.Max.Preferences.Toolbar.Formats";
NSString *OutputPreferencesToolbarItemIdentifier = @"org.sbooth.Max.Preferences.Toolbar.Output";
NSString *TaggingPreferencesToolbarItemIdentifier = @"org.sbooth.Max.Preferences.Toolbar.Tagging";
NSString *MusicBrainzPreferencesToolbarItemIdentifier = @"org.sbooth.Max.Preferences.Toolbar.MusicBrainz";
NSString *RipperPreferencesToolbarItemIdentifier = @"org.sbooth.Max.Preferences.Toolbar.Ripper";
NSString *AlbumArtPreferencesToolbarItemIdentifier = @"org.sbooth.Max.Preferences.Toolbar.AlbumArt";
NSString *iTunesPreferencesToolbarItemIdentifier = @"org.sbooth.Max.Preferences.Toolbar.iTunes";
Expand All @@ -51,7 +50,7 @@ + (void) initialize
defaultsDictionary = [NSMutableDictionary dictionaryWithCapacity:20];
defaultFiles = [NSArray arrayWithObjects:@"ApplicationControllerDefaults", @"MediaControllerDefaults",
@"ComparisonRipperDefaults", @"ParanoiaDefaults",
@"AlbumArtDefaults", @"MusicBrainzDefaults", nil];
@"AlbumArtDefaults", nil];
// Add the default values as resettable
for(i = 0; i < [defaultFiles count]; ++i) {
defaultsPath = [[NSBundle mainBundle] pathForResource:[defaultFiles objectAtIndex:i] ofType:@"plist"];
Expand Down Expand Up @@ -191,17 +190,6 @@ - (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString
[toolbarItem setToolTip: NSLocalizedStringFromTable(@"Specify custom tag names for FLAC, Ogg Vorbis and Monkey's Audio files", @"Preferences", @"")];
[toolbarItem setImage: [NSImage imageNamed:@"TaggingToolbarImage"]];

[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(selectPreferencePaneUsingToolbar:)];
}
else if([itemIdentifier isEqualToString:MusicBrainzPreferencesToolbarItemIdentifier]) {
toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier] autorelease];

[toolbarItem setLabel: NSLocalizedStringFromTable(@"MusicBrainz", @"Preferences", @"")];
[toolbarItem setPaletteLabel: NSLocalizedStringFromTable(@"MusicBrainz", @"Preferences", @"")];
[toolbarItem setToolTip: NSLocalizedStringFromTable(@"Specify the server used by MusicBrainz to retrieve disc information", @"Preferences", @"")];
[toolbarItem setImage: [NSImage imageNamed:@"MusicBrainz"]];

[toolbarItem setTarget:self];
[toolbarItem setAction:@selector(selectPreferencePaneUsingToolbar:)];
}
Expand Down Expand Up @@ -263,7 +251,6 @@ - (NSArray *) toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar
FormatsPreferencesToolbarItemIdentifier,
OutputPreferencesToolbarItemIdentifier,
RipperPreferencesToolbarItemIdentifier,
MusicBrainzPreferencesToolbarItemIdentifier,
TaggingPreferencesToolbarItemIdentifier,
AlbumArtPreferencesToolbarItemIdentifier,
iTunesPreferencesToolbarItemIdentifier,
Expand All @@ -278,7 +265,6 @@ - (NSArray *) toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
FormatsPreferencesToolbarItemIdentifier,
OutputPreferencesToolbarItemIdentifier,
RipperPreferencesToolbarItemIdentifier,
MusicBrainzPreferencesToolbarItemIdentifier,
TaggingPreferencesToolbarItemIdentifier,
AlbumArtPreferencesToolbarItemIdentifier,
iTunesPreferencesToolbarItemIdentifier,
Expand All @@ -297,7 +283,6 @@ - (NSArray *) toolbarSelectableItemIdentifiers:(NSToolbar *)toolbar
FormatsPreferencesToolbarItemIdentifier,
OutputPreferencesToolbarItemIdentifier,
RipperPreferencesToolbarItemIdentifier,
MusicBrainzPreferencesToolbarItemIdentifier,
TaggingPreferencesToolbarItemIdentifier,
AlbumArtPreferencesToolbarItemIdentifier,
iTunesPreferencesToolbarItemIdentifier,
Expand Down
Loading

0 comments on commit 2be8f11

Please sign in to comment.