Changeset 318

Timestamp:

11/27/07 02:26:04 (1 year ago)

Author:

pmerrill

Message:

• Added the ability to hide Audio info in the Media Preview.
  
• Added the ability to hide Video info in the Media Preview.
  

Files:

• trunk/AC3.png (added)
• trunk/Audio.png (modified) (previous)
• trunk/Sapphire.xcodeproj/project.pbxproj (modified) (8 diffs)
• trunk/SapphireMediaPreview.m (modified) (1 diff)
• trunk/SapphireMetaData.h (modified) (1 diff)
• trunk/SapphireSettings.h (modified) (1 diff)
• trunk/SapphireSettings.m (modified) (6 diffs)
• trunk/SapphireTheme.h (modified) (1 diff)
• trunk/SapphireTheme.m (modified) (1 diff)
• trunk/Video.png (added)

trunk/Sapphire.xcodeproj/project.pbxproj

@@ -68 +68 @@
-                FE5AAF9E0C5A96EF00932075 /* SapphireMovieChooser.m in Sources */ = {isa = PBXBuildFile; fileRef = FE5AAF9D0C5A96EF00932075 /* SapphireMovieChooser.m */; };
-                FE5BD4670C3090CD009F2B2E /* ApplianceIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = FE5BD4660C3090CD009F2B2E /* ApplianceIcon.png */; };
+                FE7856170CFC0B3900F56C1A /* Audio.png in Resources */ = {isa = PBXBuildFile; fileRef = FE7856150CFC0B3900F56C1A /* Audio.png */; };
+                FE7856180CFC0B3900F56C1A /* Video.png in Resources */ = {isa = PBXBuildFile; fileRef = FE7856160CFC0B3900F56C1A /* Video.png */; };
-                FE88FD100C2F564700C55E3F /* SapphireFileDataImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = FE88FD0F0C2F564700C55E3F /* SapphireFileDataImporter.m */; };
-                FE8D57D40C2DE4AF00BC1768 /* SapphireSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = FE8D57D30C2DE4AF00BC1768 /* SapphireSettings.m */; };
@@ -75 +77 @@
-                FE98ED5E0CF6770B000AB0F7 /* TV.png in Resources */ = {isa = PBXBuildFile; fileRef = FE98ED5C0CF6770B000AB0F7 /* TV.png */; };
-                FE98ED5F0CF6770B000AB0F7 /* Movie.png in Resources */ = {isa = PBXBuildFile; fileRef = FE98ED5D0CF6770B000AB0F7 /* Movie.png */; };
-udio.png in Resources */ = {isa = PBXBuildFile; fileRef = FE98ED650CF679EB000AB0F7 /* Audio
+C3.png in Resources */ = {isa = PBXBuildFile; fileRef = FE98ED650CF679EB000AB0F7 /* AC3
-                FE98ED6A0CF67BFF000AB0F7 /* Report.png in Resources */ = {isa = PBXBuildFile; fileRef = FE98ED680CF67BFF000AB0F7 /* Report.png */; };
-                FE98ED6B0CF67BFF000AB0F7 /* File.png in Resources */ = {isa = PBXBuildFile; fileRef = FE98ED690CF67BFF000AB0F7 /* File.png */; };
@@ -200 +202 @@
-                FE5AAF9D0C5A96EF00932075 /* SapphireMovieChooser.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SapphireMovieChooser.m; sourceTree = "<group>"; };
-                FE5BD4660C3090CD009F2B2E /* ApplianceIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ApplianceIcon.png; sourceTree = "<group>"; };
+                FE7856150CFC0B3900F56C1A /* Audio.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Audio.png; sourceTree = "<group>"; };
+                FE7856160CFC0B3900F56C1A /* Video.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Video.png; sourceTree = "<group>"; };
-                FE88FD0E0C2F564700C55E3F /* SapphireFileDataImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireFileDataImporter.h; sourceTree = "<group>"; };
-                FE88FD0F0C2F564700C55E3F /* SapphireFileDataImporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireFileDataImporter.m; sourceTree = "<group>"; };
@@ -210 +214 @@
-                FE98ED5C0CF6770B000AB0F7 /* TV.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = TV.png; sourceTree = "<group>"; };
-                FE98ED5D0CF6770B000AB0F7 /* Movie.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Movie.png; sourceTree = "<group>"; };
-udio.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Audio
+C3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = AC3
-                FE98ED680CF67BFF000AB0F7 /* Report.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Report.png; sourceTree = "<group>"; };
-                FE98ED690CF67BFF000AB0F7 /* File.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = File.png; sourceTree = "<group>"; };
@@ -274 +278 @@
-                        isa = PBXGroup;
-                        children = (
+                                FE7856150CFC0B3900F56C1A /* Audio.png */,
+                                FE7856160CFC0B3900F56C1A /* Video.png */,
-                                FED50A010CFB401F006982D2 /* AMPAS_Oscar.png */,
-                                FEC18C300CF7D99F001DCAB9 /* FrontRow.png */,
@@ -281 +287 @@
-                                FE98ED680CF67BFF000AB0F7 /* Report.png */,
-                                FE98ED690CF67BFF000AB0F7 /* File.png */,
-udio
+C3
-                                FE98ED5C0CF6770B000AB0F7 /* TV.png */,
-                                FE98ED5D0CF6770B000AB0F7 /* Movie.png */,
@@ -551 +557 @@
-                                FE98ED5E0CF6770B000AB0F7 /* TV.png in Resources */,
-                                FE98ED5F0CF6770B000AB0F7 /* Movie.png in Resources */,
-udio
+C3
-                                FE98ED6A0CF67BFF000AB0F7 /* Report.png in Resources */,
-                                FE98ED6B0CF67BFF000AB0F7 /* File.png in Resources */,
@@ -559 +565 @@
-                                FEC18C330CF7D99F001DCAB9 /* FastSwitch.png in Resources */,
-                                FED50A020CFB401F006982D2 /* AMPAS_Oscar.png in Resources */,
+                                FE7856170CFC0B3900F56C1A /* Audio.png in Resources */,
+                                FE7856180CFC0B3900F56C1A /* Video.png in Resources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/SapphireMediaPreview.m

@@ -373 +373 @@
-        }
-        
+        /* Show / Hide perian info */
+        if(![[SapphireSettings sharedSettings] displayAudio])
+                [allMeta removeObjectForKey:AUDIO_DESC_LABEL_KEY];
+        if(![[SapphireSettings sharedSettings] displayVideo])
+                [allMeta removeObjectForKey:VIDEO_DESC_LABEL_KEY];
+        
-        NSMutableArray *values = [NSMutableArray array];
-        NSMutableArray *keys = [NSMutableArray array];

trunk/SapphireMetaData.h

@@ -52 +52 @@
-#define META_EPISODE_AND_SEASON_KEY             @"S/E"
-#define META_MOVIE_IMDB_STATS_KEY               @"IMDB"
+#define AUDIO_DESC_LABEL_KEY                    @"Audio"
+#define VIDEO_DESC_LABEL_KEY                    @"Video"
-
-#define META_DATA_FILE_ADDED_NOTIFICATION                               @"MetaDataFileAdded"

trunk/SapphireSettings.h

@@ -32 +32 @@
-- (BOOL)displayTopShows;
-- (BOOL)displaySpoilers;
+- (BOOL)displayAudio;
+- (BOOL)displayVideo;
-- (BOOL)disableUIQuit;
-- (BOOL)disableAnonymousReporting;

trunk/SapphireSettings.m

@@ -28 +28 @@
-@implementation SapphireSettings
-
-
-
-
-
-
+
+
+
+
+
+
+
-#define ENABLE_FAST_SWITCHING_KEY       @"EnableFastSwitching"
-
-
-
+               
+               
+               
-
-/*!
@@ -84 +86 @@
-                                                                                                BRLocalizedString(@"  Skip \"Unwatched Shows\" filter", @"Skip Unwatched shows menu item"), 
-                                                                                                BRLocalizedString(@"  Hide Show Spoilers", @"Hide show summarys menu item"),
+                                                                                                BRLocalizedString(@"  Hide Audio Info", @"Hide perian audio info menu item"),
+                                                                                                BRLocalizedString(@"  Hide Video Info", @"Hide perian video info menu item"),
-                                                                                                BRLocalizedString(@"  Hide UI Quit", @"Hide the ui quitter menu item"),
-                                                                                                BRLocalizedString(@"  Fast Directory Switching", @"Don't rescan directories upon entry and used cached data"),
@@ -99 +103 @@
-                                                                                                        HIDE_UNWATCHED_KEY,  
-                                                                                                        HIDE_SPOILERS_KEY,
+                                                                                                        HIDE_AUDIO_KEY,
+                                                                                                        HIDE_VIDEO_KEY,
-                                                                                                        HIDE_UI_QUIT_KEY,
-                                                                                                        ENABLE_FAST_SWITCHING_KEY,
@@ -114 +120 @@
-                                                                                                [theme gem:BLUE_GEM_KEY],
-                                                                                                [theme gem:NOTE_GEM_KEY],
+                                                                                                [theme gem:AUDIO_GEM_KEY],
+                                                                                                [theme gem:VIDEO_GEM_KEY],
-                                                                                                [theme gem:FRONTROW_GEM_KEY],
-                                                                                                [theme gem:FAST_GEM_KEY],
-UDIO
+C3
-                                                                                                [theme gem:REPORT_GEM_KEY], nil];               
-        
@@ -127 +135 @@
-                [NSNumber numberWithBool:NO], HIDE_UNWATCHED_KEY,
-                [NSNumber numberWithBool:NO], HIDE_SPOILERS_KEY,
+                [NSNumber numberWithBool:NO], HIDE_AUDIO_KEY,
+                [NSNumber numberWithBool:NO], HIDE_VIDEO_KEY,
-                [NSNumber numberWithBool:YES], HIDE_UI_QUIT_KEY,
-                [NSNumber numberWithBool:YES], ENABLE_FAST_SWITCHING_KEY,
@@ -235 +245 @@
-{
-        return ![self boolForKey:HIDE_SPOILERS_KEY];
+}
+
+/*!
+ * @brief Returns whether to display audio info
+ *
+ * @return YES if set, NO otherwise
+ */
+- (BOOL)displayAudio;
+{
+        return ![self boolForKey:HIDE_AUDIO_KEY];
+}
+
+/*!
+ * @brief Returns whether to display video info
+ *
+ * @return YES if set, NO otherwise
+ */
+- (BOOL)displayVideo;
+{
+        return ![self boolForKey:HIDE_VIDEO_KEY];
-}
-

trunk/SapphireTheme.h

@@ -17 +17 @@
-#define OSCAR_GEM_KEY @"OscarGem"
-#define TVR_GEM_KEY @"TVRageGem"
+#define AC3_GEM_KEY @"AC3Gem"
-#define AUDIO_GEM_KEY @"AudioGem"
+#define VIDEO_GEM_KEY @"VideoGem"
-#define FILE_GEM_KEY @"FileGem"
-#define REPORT_GEM_KEY @"ReportGem"

trunk/SapphireTheme.m

@@ -41 +41 @@
-                @"Contents/Resources/Cone.png", CONE_GEM_KEY,
-                @"Contents/Resources/Eye.png", EYE_GEM_KEY,
+                @"Contents/Resources/AC3.png", AC3_GEM_KEY,
-                @"Contents/Resources/Audio.png", AUDIO_GEM_KEY,
+                @"Contents/Resources/Video.png", VIDEO_GEM_KEY,
-                @"Contents/Resources/TV.png", TV_GEM_KEY,
-                @"Contents/Resources/Movie.png", MOV_GEM_KEY,