MacGui: Update Toolbar icons with the HawkPack

- Thanks hawkman!

git-svn-id: svn://localhost/HandBrake/trunk@959 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 2993a3a..253e0ee 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -364,7 +364,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
         [item setLabel: @"Toggle Presets"];
         [item setPaletteLabel: @"Toggler Presets"];
         [item setToolTip: @"Open/Close Preset Drawer"];
-        [item setImage: [NSImage imageNamed: @"Drawer-List2"]];
+        [item setImage: [NSImage imageNamed: @"Drawer"]];
         [item setTarget: self];
         [item setAction: @selector(toggleDrawer:)];
         [item setAutovalidates: NO];
@@ -383,7 +383,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
         [item setLabel: @"Show Queue"];
         [item setPaletteLabel: @"Show Queue"];
         [item setToolTip: @"Show Queue"];
-        [item setImage: [NSImage imageNamed: @"Brushed Window"]];
+        [item setImage: [NSImage imageNamed: @"Queue"]];
         [item setTarget: self];
         [item setAction: @selector(showQueueWindow:)];
         [item setAutovalidates: NO];
@@ -393,7 +393,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
         [item setLabel: @"Add to Queue"];
         [item setPaletteLabel: @"Add to Queue"];
         [item setToolTip: @"Add to Queue"];
-        [item setImage: [NSImage imageNamed: @"Add"]];
+        [item setImage: [NSImage imageNamed: @"AddToQueue"]];
         [item setTarget: self];
         [item setAction: @selector(addToQueue:)];
     }
@@ -410,7 +410,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
         [item setLabel: @"Activity Window"];
         [item setPaletteLabel: @"Show Activity Window"];
         [item setToolTip: @"Show Activity Window"];
-        [item setImage: [NSImage imageNamed: @"Terminal"]];
+        [item setImage: [NSImage imageNamed: @"ActivityWindow"]];
         [item setTarget: self];
         [item setAction: @selector(showDebugOutputPanel:)];
         [item setAutovalidates: NO];
@@ -420,7 +420,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
         [item setLabel: @"Source"];
         [item setPaletteLabel: @"Source"];
         [item setToolTip: @"Choose Video Source"];
-        [item setImage: [NSImage imageNamed: @"Disc"]];
+        [item setImage: [NSImage imageNamed: @"Source"]];
         [item setTarget: self];
         [item setAction: @selector(showScanPanel:)];
     }

diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index f33c7bb..ee68671 100644 (file)
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -115,7 +115,7 @@
     else if ([ident isEqualToString: TOOLBAR_ADVANCED])
     {
         [item setLabel: NSLocalizedString(@"Advanced", "Advanced")];
-//        [item setImage: [NSImage imageNamed: @"pref-advanced"]];
+        [item setImage: [NSImage imageNamed: @"pref-advanced"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
         [item setAutovalidates: NO];

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index c4b9408..ad84ce2 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -120,6 +120,15 @@
                A29E058B0BE12889000533F5 /* Growl.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A29E057F0BE1283E000533F5 /* Growl.framework */; };
                A2A1EC310C76C35E00827E0D /* HBDVDDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */; };
                A2A1EC3A0C76C58400827E0D /* HBDVDDetector.m in Sources */ = {isa = PBXBuildFile; fileRef = A2A1EC390C76C58400827E0D /* HBDVDDetector.m */; };
+               A2D7AD670C998AD30082CA33 /* ActivityWindow.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */; };
+               A2D7AD680C998AD30082CA33 /* AddToQueue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */; };
+               A2D7AD690C998AD30082CA33 /* Drawer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD600C998AD30082CA33 /* Drawer.tiff */; };
+               A2D7AD6A0C998AD30082CA33 /* pref-advanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD610C998AD30082CA33 /* pref-advanced.tiff */; };
+               A2D7AD6B0C998AD30082CA33 /* pref-audio.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD620C998AD30082CA33 /* pref-audio.tiff */; };
+               A2D7AD6C0C998AD30082CA33 /* pref-general.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD630C998AD30082CA33 /* pref-general.tiff */; };
+               A2D7AD6D0C998AD30082CA33 /* pref-picture.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD640C998AD30082CA33 /* pref-picture.tiff */; };
+               A2D7AD6E0C998AD30082CA33 /* Queue.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD650C998AD30082CA33 /* Queue.tiff */; };
+               A2D7AD6F0C998AD30082CA33 /* Source.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D7AD660C998AD30082CA33 /* Source.tiff */; };
                A2DFC66E0C6196D900E66E89 /* actionWidget.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DFC66C0C6196D900E66E89 /* actionWidget.png */; };
                A2DFC66F0C6196D900E66E89 /* actionWidgetPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A2DFC66D0C6196D900E66E89 /* actionWidgetPressed.png */; };
                A2DFC6750C6197C600E66E89 /* MVMenuButton.h in Headers */ = {isa = PBXBuildFile; fileRef = A2DFC6740C6197C600E66E89 /* MVMenuButton.h */; };
@@ -293,6 +302,15 @@
                A29E057F0BE1283E000533F5 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Growl.framework; sourceTree = "<group>"; };
                A2A1EC300C76C35E00827E0D /* HBDVDDetector.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HBDVDDetector.h; sourceTree = "<group>"; };
                A2A1EC390C76C58400827E0D /* HBDVDDetector.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HBDVDDetector.m; sourceTree = "<group>"; };
+               A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = ActivityWindow.tiff; path = icons/ActivityWindow.tiff; sourceTree = "<group>"; };
+               A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = AddToQueue.tiff; path = icons/AddToQueue.tiff; sourceTree = "<group>"; };
+               A2D7AD600C998AD30082CA33 /* Drawer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Drawer.tiff; path = icons/Drawer.tiff; sourceTree = "<group>"; };
+               A2D7AD610C998AD30082CA33 /* pref-advanced.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-advanced.tiff"; path = "icons/pref-advanced.tiff"; sourceTree = "<group>"; };
+               A2D7AD620C998AD30082CA33 /* pref-audio.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-audio.tiff"; path = "icons/pref-audio.tiff"; sourceTree = "<group>"; };
+               A2D7AD630C998AD30082CA33 /* pref-general.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-general.tiff"; path = "icons/pref-general.tiff"; sourceTree = "<group>"; };
+               A2D7AD640C998AD30082CA33 /* pref-picture.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "pref-picture.tiff"; path = "icons/pref-picture.tiff"; sourceTree = "<group>"; };
+               A2D7AD650C998AD30082CA33 /* Queue.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Queue.tiff; path = icons/Queue.tiff; sourceTree = "<group>"; };
+               A2D7AD660C998AD30082CA33 /* Source.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = Source.tiff; path = icons/Source.tiff; sourceTree = "<group>"; };
                A2DFC66C0C6196D900E66E89 /* actionWidget.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = actionWidget.png; sourceTree = "<group>"; };
                A2DFC66D0C6196D900E66E89 /* actionWidgetPressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = actionWidgetPressed.png; sourceTree = "<group>"; };
                A2DFC6740C6197C600E66E89 /* MVMenuButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MVMenuButton.h; sourceTree = "<group>"; };
@@ -401,6 +419,15 @@
                29B97314FDCFA39411CA2CEA /* HandBrake */ = {
                        isa = PBXGroup;
                        children = (
+                               A2D7AD5E0C998AD30082CA33 /* ActivityWindow.tiff */,
+                               A2D7AD5F0C998AD30082CA33 /* AddToQueue.tiff */,
+                               A2D7AD600C998AD30082CA33 /* Drawer.tiff */,
+                               A2D7AD610C998AD30082CA33 /* pref-advanced.tiff */,
+                               A2D7AD620C998AD30082CA33 /* pref-audio.tiff */,
+                               A2D7AD630C998AD30082CA33 /* pref-general.tiff */,
+                               A2D7AD640C998AD30082CA33 /* pref-picture.tiff */,
+                               A2D7AD650C998AD30082CA33 /* Queue.tiff */,
+                               A2D7AD660C998AD30082CA33 /* Source.tiff */,
                                526FBC940B4CAA310064E04C /* Instant HandBrake Sources */,
                                526FBC930B4CAA260064E04C /* HandBrake Sources */,
                                526FBC920B4CAA120064E04C /* HandBrakeCLI Sources */,
@@ -799,6 +826,15 @@
                                A94537560C95E6A300EBB9B1 /* pref-picture.png in Resources */,
                                A91C68A20C967D83003ADAD1 /* pref-audio.png in Resources */,
                                A96041080C96FC5C00CBAB1E /* pref-general.png in Resources */,
+                               A2D7AD670C998AD30082CA33 /* ActivityWindow.tiff in Resources */,
+                               A2D7AD680C998AD30082CA33 /* AddToQueue.tiff in Resources */,
+                               A2D7AD690C998AD30082CA33 /* Drawer.tiff in Resources */,
+                               A2D7AD6A0C998AD30082CA33 /* pref-advanced.tiff in Resources */,
+                               A2D7AD6B0C998AD30082CA33 /* pref-audio.tiff in Resources */,
+                               A2D7AD6C0C998AD30082CA33 /* pref-general.tiff in Resources */,
+                               A2D7AD6D0C998AD30082CA33 /* pref-picture.tiff in Resources */,
+                               A2D7AD6E0C998AD30082CA33 /* Queue.tiff in Resources */,
+                               A2D7AD6F0C998AD30082CA33 /* Source.tiff in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/macosx/icons/ActivityWindow.tiff b/macosx/icons/ActivityWindow.tiff
new file mode 100644 (file)
index 0000000..c4f67c1
Binary files /dev/null and b/macosx/icons/ActivityWindow.tiff differ

diff --git a/macosx/icons/AddToQueue.tiff b/macosx/icons/AddToQueue.tiff
new file mode 100644 (file)
index 0000000..3ba9627
Binary files /dev/null and b/macosx/icons/AddToQueue.tiff differ

diff --git a/macosx/icons/Drawer.tiff b/macosx/icons/Drawer.tiff
new file mode 100644 (file)
index 0000000..7beb830
Binary files /dev/null and b/macosx/icons/Drawer.tiff differ

diff --git a/macosx/icons/JobLarge.png b/macosx/icons/JobLarge.png
index 5b9c18f..9b8f08d 100644 (file)
Binary files a/macosx/icons/JobLarge.png and b/macosx/icons/JobLarge.png differ

diff --git a/macosx/icons/JobSmall.png b/macosx/icons/JobSmall.png
index 9467aef..486885c 100644 (file)
Binary files a/macosx/icons/JobSmall.png and b/macosx/icons/JobSmall.png differ

diff --git a/macosx/icons/Queue.tiff b/macosx/icons/Queue.tiff
new file mode 100644 (file)
index 0000000..ead4789
Binary files /dev/null and b/macosx/icons/Queue.tiff differ

diff --git a/macosx/icons/Source.tiff b/macosx/icons/Source.tiff
new file mode 100644 (file)
index 0000000..858a4c5
Binary files /dev/null and b/macosx/icons/Source.tiff differ

diff --git a/macosx/icons/pref-advanced.tiff b/macosx/icons/pref-advanced.tiff
new file mode 100644 (file)
index 0000000..b1a2d7b
Binary files /dev/null and b/macosx/icons/pref-advanced.tiff differ

diff --git a/macosx/icons/pref-audio.tiff b/macosx/icons/pref-audio.tiff
new file mode 100644 (file)
index 0000000..c8078a5
Binary files /dev/null and b/macosx/icons/pref-audio.tiff differ

diff --git a/macosx/icons/pref-general.tiff b/macosx/icons/pref-general.tiff
new file mode 100644 (file)
index 0000000..8cc6c5e
Binary files /dev/null and b/macosx/icons/pref-general.tiff differ

diff --git a/macosx/icons/pref-picture.tiff b/macosx/icons/pref-picture.tiff
new file mode 100644 (file)
index 0000000..975ca56
Binary files /dev/null and b/macosx/icons/pref-picture.tiff differ