[MPlayer-dev-eng] [PATCH] MPlayer OSX GUI Improvement and Cleanup
John Wells
iindigo at gmail.com
Thu Jan 18 22:39:25 CET 2007
Hi,
I've refined and cleaned up the video player/playlist windows of
MPlayer OSX. I've also made the interface fit in with OS X better.
I believe by sending this message that I am submitting a patch
correctly; please correct me if I did anything wrong.
Attached to this message are the images necessary for the patch.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mplayerosx_uipatch.zip
Type: application/zip
Size: 209306 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20070118/fd4459a9/attachment.zip>
-------------- next part --------------
SVN diff output:
Index: Sources/Controllers/PlayListController.m
===================================================================
--- Sources/Controllers/PlayListController.m (revision 128)
+++ Sources/Controllers/PlayListController.m (working copy)
@@ -109,12 +109,21 @@
playMode0Image = [[NSImage alloc] initWithContentsOfFile:
[[NSBundle mainBundle]
pathForResource:@"play_mode_0"
ofType:@"png"]];
+ playMode0PressedImage = [[NSImage alloc]
initWithContentsOfFile:[[NSBundle mainBundle]
+
pathForResource:@"play_mode_0_pressed"
+ ofType:@"png"]];
playMode1Image = [[NSImage alloc] initWithContentsOfFile:
[[NSBundle mainBundle]
pathForResource:@"play_mode_1"
ofType:@"png"]];
+ playMode1PressedImage = [[NSImage alloc]
initWithContentsOfFile:[[NSBundle mainBundle]
+
pathForResource:@"play_mode_1_pressed"
+ ofType:@"png"]];
playMode2Image = [[NSImage alloc] initWithContentsOfFile:
[[NSBundle mainBundle]
pathForResource:@"play_mode_2"
ofType:@"png"]];
+ playMode2PressedImage = [[NSImage alloc]
initWithContentsOfFile:[[NSBundle mainBundle]
+
pathForResource:@"play_mode_2_pressed"
+ ofType:@"png"]];
// set play mode
if ([[appController preferences] objectForKey:@"PlayMode"])
@@ -278,14 +287,17 @@
switch (myPlayMode) {
case 1:
[playModeButton setImage:playMode1Image];
+ [playModeButton
setAlternateImage:playMode1PressedImage];
[playModeButton setToolTip:NSLocalizedString(@"Play
mode: Continous",nil)];
break;
case 2:
[playModeButton setImage:playMode2Image];
+ [playModeButton
setAlternateImage:playMode2PressedImage];
[playModeButton setToolTip:NSLocalizedString(@"Play
mode: Repeating",nil)];
break;
default:
[playModeButton setImage:playMode0Image];
+ [playModeButton
setAlternateImage:playMode0PressedImage];
[playModeButton setToolTip:NSLocalizedString(@"Play
mode: Single",nil)];
break;
}
Index: Sources/Controllers/PlayListController.h
===================================================================
--- Sources/Controllers/PlayListController.h (revision 128)
+++ Sources/Controllers/PlayListController.h (working copy)
@@ -45,8 +45,11 @@
// images
NSImage *statusIcon;
NSImage *playMode0Image;
+ NSImage *playMode0PressedImage;
NSImage *playMode1Image;
+ NSImage *playMode1PressedImage;
NSImage *playMode2Image;
+ NSImage *playMode2PressedImage;
//toolbar
NSMutableDictionary *toolbarItems;
Index: Sources/Controllers/PlayerController.m
===================================================================
--- Sources/Controllers/PlayerController.m (revision 128)
+++ Sources/Controllers/PlayerController.m (working copy)
@@ -1143,7 +1143,6 @@
{
[myPlayer sendCommand: [NSString
stringWithFormat:@"key_down_event %d",event]];
}
-
/
************************************************************************
************
DELEGATE METHODS
************************************************************************
************/
Index: MPlayer OSX.xcodeproj/project.pbxproj
===================================================================
--- MPlayer OSX.xcodeproj/project.pbxproj (revision 128)
+++ MPlayer OSX.xcodeproj/project.pbxproj (working copy)
@@ -127,13 +127,43 @@
37EA4BC2086271480026216A /* scrub_bar_anim.png in
Resources */ = {isa = PBXBuildFile; fileRef =
37EA4BC1086271480026216A /* scrub_bar_anim.png */; };
8D11072D0486CEB800E47090 /* main.m in Sources */ =
{isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */;
settings = {ATTRIBUTES = (); }; };
8D11072F0486CEB800E47090 /* Cocoa.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef =
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+ B3548D580B5F95AA00AE8CF8 /* buttonbg.tiff in
Resources */ = {isa = PBXBuildFile; fileRef =
B3548D570B5F95AA00AE8CF8 /* buttonbg.tiff */; };
+ B3548D590B5F95AA00AE8CF8 /* buttonbg.tiff in
Resources */ = {isa = PBXBuildFile; fileRef =
B3548D570B5F95AA00AE8CF8 /* buttonbg.tiff */; };
+ B3548D5F0B5F973300AE8CF8 /* info_pressed.png in
Resources */ = {isa = PBXBuildFile; fileRef =
B3548D5E0B5F973300AE8CF8 /* info_pressed.png */; };
+ B3548D600B5F973300AE8CF8 /* info_pressed.png in
Resources */ = {isa = PBXBuildFile; fileRef =
B3548D5E0B5F973300AE8CF8 /* info_pressed.png */; };
+ B3548D630B6015E700AE8CF8 /* play_mode_0_pressed.png
in Resources */ = {isa = PBXBuildFile; fileRef =
B3548D620B6015E700AE8CF8 /* play_mode_0_pressed.png */; };
+ B3548D640B6015E700AE8CF8 /* play_mode_0_pressed.png
in Resources */ = {isa = PBXBuildFile; fileRef =
B3548D620B6015E700AE8CF8 /* play_mode_0_pressed.png */; };
+ B3548D740B60187E00AE8CF8 /* play_mode_1_pressed.png
in Resources */ = {isa = PBXBuildFile; fileRef =
B3548D730B60187E00AE8CF8 /* play_mode_1_pressed.png */; };
+ B3548D750B60187E00AE8CF8 /* play_mode_1_pressed.png
in Resources */ = {isa = PBXBuildFile; fileRef =
B3548D730B60187E00AE8CF8 /* play_mode_1_pressed.png */; };
+ B3548D770B60188700AE8CF8 /* play_mode_2_pressed.png
in Resources */ = {isa = PBXBuildFile; fileRef =
B3548D760B60188700AE8CF8 /* play_mode_2_pressed.png */; };
+ B3548D780B60188700AE8CF8 /* play_mode_2_pressed.png
in Resources */ = {isa = PBXBuildFile; fileRef =
B3548D760B60188700AE8CF8 /* play_mode_2_pressed.png */; };
+ B35D63FB0B5EDF8400131ACB /* scrub_bg_center.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D63FA0B5EDF8400131ACB /* scrub_bg_center.tif */; };
+ B35D63FC0B5EDF8400131ACB /* scrub_bg_center.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D63FA0B5EDF8400131ACB /* scrub_bg_center.tif */; };
+ B35D63FE0B5EDFB700131ACB /* scrub_bg_left.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D63FD0B5EDFB700131ACB /* scrub_bg_left.tif */; };
+ B35D63FF0B5EDFB700131ACB /* scrub_bg_left.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D63FD0B5EDFB700131ACB /* scrub_bg_left.tif */; };
+ B35D64010B5EDFBC00131ACB /* scrub_bg_right.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D64000B5EDFBC00131ACB /* scrub_bg_right.tif */; };
+ B35D64020B5EDFBC00131ACB /* scrub_bg_right.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D64000B5EDFBC00131ACB /* scrub_bg_right.tif */; };
+ B35D64150B5EE63400131ACB /* vidbevel_bottom.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D64140B5EE63400131ACB /* vidbevel_bottom.tif */; };
+ B35D64160B5EE63400131ACB /* vidbevel_bottom.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D64140B5EE63400131ACB /* vidbevel_bottom.tif */; };
+ B35D64180B5EE63A00131ACB /* vidbevel_sides.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D64170B5EE63A00131ACB /* vidbevel_sides.tif */; };
+ B35D64190B5EE63A00131ACB /* vidbevel_sides.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D64170B5EE63A00131ACB /* vidbevel_sides.tif */; };
+ B35D641B0B5EE64000131ACB /* vidbevel_top.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D641A0B5EE64000131ACB /* vidbevel_top.tif */; };
+ B35D641C0B5EE64000131ACB /* vidbevel_top.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D641A0B5EE64000131ACB /* vidbevel_top.tif */; };
+ B35D647D0B5F00FE00131ACB /* volume_high.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D647C0B5F00FE00131ACB /* volume_high.tif */; };
+ B35D647E0B5F00FE00131ACB /* volume_high.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D647C0B5F00FE00131ACB /* volume_high.tif */; };
+ B35D64800B5F010200131ACB /* volume_low.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D647F0B5F010200131ACB /* volume_low.tif */; };
+ B35D64810B5F010200131ACB /* volume_low.tif in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D647F0B5F010200131ACB /* volume_low.tif */; };
+ B35D649E0B5F100600131ACB /* fullscreen.png in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D649D0B5F100600131ACB /* fullscreen.png */; };
+ B35D649F0B5F100600131ACB /* fullscreen.png in
Resources */ = {isa = PBXBuildFile; fileRef =
B35D649D0B5F100600131ACB /* fullscreen.png */; };
+ B35D64B00B5F138200131ACB /* playlist.tif in Resources
*/ = {isa = PBXBuildFile; fileRef = B35D64AF0B5F138200131ACB /*
playlist.tif */; };
+ B35D64B10B5F138200131ACB /* playlist.tif in Resources
*/ = {isa = PBXBuildFile; fileRef = B35D64AF0B5F138200131ACB /*
playlist.tif */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ =
{isa = PBXFileReference; lastKnownFileType = wrapper.framework; name
= Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework;
sourceTree = "<absolute>"; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; name = main.m; path = Sources/main.m; sourceTree =
"<group>"; };
32CA4F630368D1EE00C91783 /* MPlayer OSX_Prefix.pch
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; name = "MPlayer OSX_Prefix.pch"; path = "Sources/
MPlayer OSX_Prefix.pch"; sourceTree = "<group>"; };
- 371875E30B2307130096E1ED /* MPlayer OSX PPC.app */ =
{isa = PBXFileReference; includeInIndex = 0; lastKnownFileType =
wrapper.application; path = "MPlayer OSX PPC.app"; sourceTree =
BUILT_PRODUCTS_DIR; };
+ 371875E30B2307130096E1ED /* MPlayer OSX PPC.app */ =
{isa = PBXFileReference; explicitFileType = wrapper.application;
includeInIndex = 0; path = "MPlayer OSX PPC.app"; sourceTree =
BUILT_PRODUCTS_DIR; };
371875E50B2307130096E1ED /* MPlayer OSX PPC-
Info.plist */ = {isa = PBXFileReference; lastKnownFileType =
text.xml; name = "MPlayer OSX PPC-Info.plist"; path = "Resources/
MPlayer OSX PPC-Info.plist"; sourceTree = "<group>"; };
371878190B230ABD0096E1ED /* QuickTime.framework */ =
{isa = PBXFileReference; lastKnownFileType = wrapper.framework; name
= QuickTime.framework; path = /System/Library/Frameworks/
QuickTime.framework; sourceTree = "<absolute>"; };
371878800B2334880096E1ED /* External_Binaries */ =
{isa = PBXFileReference; lastKnownFileType = folder; path =
External_Binaries; sourceTree = "<group>"; };
@@ -205,7 +235,22 @@
37EA4ABD086220520026216A /* volumeKnobOn.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; name =
volumeKnobOn.png; path = Resources/Graphics/volumeKnobOn.png;
sourceTree = "<group>"; };
37EA4BC1086271480026216A /* scrub_bar_anim.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; name =
scrub_bar_anim.png; path = Resources/Graphics/scrub_bar_anim.png;
sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml;
name = Info.plist; path = Resources/Info.plist; sourceTree =
"<group>"; };
- 8D1107320486CEB800E47090 /* MPlayer OSX.app */ = {isa
= PBXFileReference; includeInIndex = 0; lastKnownFileType =
wrapper.application; path = "MPlayer OSX.app"; sourceTree =
BUILT_PRODUCTS_DIR; };
+ 8D1107320486CEB800E47090 /* MPlayer OSX.app */ = {isa
= PBXFileReference; explicitFileType = wrapper.application;
includeInIndex = 0; path = "MPlayer OSX.app"; sourceTree =
BUILT_PRODUCTS_DIR; };
+ B3548D570B5F95AA00AE8CF8 /* buttonbg.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; name =
buttonbg.tiff; path = Resources/Graphics/buttonbg.tiff; sourceTree =
"<group>"; };
+ B3548D5E0B5F973300AE8CF8 /* info_pressed.png */ =
{isa = PBXFileReference; lastKnownFileType = image.png; name =
info_pressed.png; path = Resources/Graphics/info_pressed.png;
sourceTree = "<group>"; };
+ B3548D620B6015E700AE8CF8 /* play_mode_0_pressed.png
*/ = {isa = PBXFileReference; lastKnownFileType = image.png; name =
play_mode_0_pressed.png; path = Resources/Graphics/
play_mode_0_pressed.png; sourceTree = "<group>"; };
+ B3548D730B60187E00AE8CF8 /* play_mode_1_pressed.png
*/ = {isa = PBXFileReference; lastKnownFileType = image.png; name =
play_mode_1_pressed.png; path = Resources/Graphics/
play_mode_1_pressed.png; sourceTree = "<group>"; };
+ B3548D760B60188700AE8CF8 /* play_mode_2_pressed.png
*/ = {isa = PBXFileReference; lastKnownFileType = image.png; name =
play_mode_2_pressed.png; path = Resources/Graphics/
play_mode_2_pressed.png; sourceTree = "<group>"; };
+ B35D63FA0B5EDF8400131ACB /* scrub_bg_center.tif */ =
{isa = PBXFileReference; lastKnownFileType = image.tiff; name =
scrub_bg_center.tif; path = Resources/Graphics/scrub_bg_center.tif;
sourceTree = "<group>"; };
+ B35D63FD0B5EDFB700131ACB /* scrub_bg_left.tif */ =
{isa = PBXFileReference; lastKnownFileType = image.tiff; name =
scrub_bg_left.tif; path = Resources/Graphics/scrub_bg_left.tif;
sourceTree = "<group>"; };
+ B35D64000B5EDFBC00131ACB /* scrub_bg_right.tif */ =
{isa = PBXFileReference; lastKnownFileType = image.tiff; name =
scrub_bg_right.tif; path = Resources/Graphics/scrub_bg_right.tif;
sourceTree = "<group>"; };
+ B35D64140B5EE63400131ACB /* vidbevel_bottom.tif */ =
{isa = PBXFileReference; lastKnownFileType = image.tiff; name =
vidbevel_bottom.tif; path = Resources/Graphics/vidbevel_bottom.tif;
sourceTree = "<group>"; };
+ B35D64170B5EE63A00131ACB /* vidbevel_sides.tif */ =
{isa = PBXFileReference; lastKnownFileType = image.tiff; name =
vidbevel_sides.tif; path = Resources/Graphics/vidbevel_sides.tif;
sourceTree = "<group>"; };
+ B35D641A0B5EE64000131ACB /* vidbevel_top.tif */ =
{isa = PBXFileReference; lastKnownFileType = image.tiff; name =
vidbevel_top.tif; path = Resources/Graphics/vidbevel_top.tif;
sourceTree = "<group>"; };
+ B35D647C0B5F00FE00131ACB /* volume_high.tif */ = {isa
= PBXFileReference; lastKnownFileType = image.tiff; name =
volume_high.tif; path = Resources/Graphics/volume_high.tif;
sourceTree = "<group>"; };
+ B35D647F0B5F010200131ACB /* volume_low.tif */ = {isa
= PBXFileReference; lastKnownFileType = image.tiff; name =
volume_low.tif; path = Resources/Graphics/volume_low.tif; sourceTree
= "<group>"; };
+ B35D649D0B5F100600131ACB /* fullscreen.png */ = {isa
= PBXFileReference; lastKnownFileType = image.png; name =
fullscreen.png; path = Resources/Graphics/fullscreen.png; sourceTree
= "<group>"; };
+ B35D64AF0B5F138200131ACB /* playlist.tif */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; name =
playlist.tif; path = Resources/Graphics/playlist.tif; sourceTree =
"<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -350,6 +395,21 @@
377E032C085E3ED500D64A26 /*
volume2.png */,
377E032D085E3ED500D64A26 /*
volume3.png */,
8D1107310486CEB800E47090 /*
Info.plist */,
+ B35D63FA0B5EDF8400131ACB /*
scrub_bg_center.tif */,
+ B35D63FD0B5EDFB700131ACB /*
scrub_bg_left.tif */,
+ B35D64000B5EDFBC00131ACB /*
scrub_bg_right.tif */,
+ B35D64140B5EE63400131ACB /*
vidbevel_bottom.tif */,
+ B35D64170B5EE63A00131ACB /*
vidbevel_sides.tif */,
+ B35D641A0B5EE64000131ACB /*
vidbevel_top.tif */,
+ B35D647C0B5F00FE00131ACB /*
volume_high.tif */,
+ B35D647F0B5F010200131ACB /*
volume_low.tif */,
+ B35D649D0B5F100600131ACB /*
fullscreen.png */,
+ B35D64AF0B5F138200131ACB /*
playlist.tif */,
+ B3548D570B5F95AA00AE8CF8 /*
buttonbg.tiff */,
+ B3548D5E0B5F973300AE8CF8 /*
info_pressed.png */,
+ B3548D620B6015E700AE8CF8 /*
play_mode_0_pressed.png */,
+ B3548D730B60187E00AE8CF8 /*
play_mode_1_pressed.png */,
+ B3548D760B60188700AE8CF8 /*
play_mode_2_pressed.png */,
);
name = Resources;
sourceTree = "<group>";
@@ -487,6 +547,21 @@
371876220B23084D0096E1ED /*
volumeKnobOn.png in Resources */,
3718783F0B231A8F0096E1ED /* MPlayer
OSX PPC-Info.plist in Resources */,
371878840B2334890096E1ED /*
External_Binaries in Resources */,
+ B35D63FC0B5EDF8400131ACB /*
scrub_bg_center.tif in Resources */,
+ B35D63FF0B5EDFB700131ACB /*
scrub_bg_left.tif in Resources */,
+ B35D64020B5EDFBC00131ACB /*
scrub_bg_right.tif in Resources */,
+ B35D64160B5EE63400131ACB /*
vidbevel_bottom.tif in Resources */,
+ B35D64190B5EE63A00131ACB /*
vidbevel_sides.tif in Resources */,
+ B35D641C0B5EE64000131ACB /*
vidbevel_top.tif in Resources */,
+ B35D647E0B5F00FE00131ACB /*
volume_high.tif in Resources */,
+ B35D64810B5F010200131ACB /*
volume_low.tif in Resources */,
+ B35D649F0B5F100600131ACB /*
fullscreen.png in Resources */,
+ B35D64B10B5F138200131ACB /*
playlist.tif in Resources */,
+ B3548D590B5F95AA00AE8CF8 /*
buttonbg.tiff in Resources */,
+ B3548D600B5F973300AE8CF8 /*
info_pressed.png in Resources */,
+ B3548D640B6015E700AE8CF8 /*
play_mode_0_pressed.png in Resources */,
+ B3548D750B60187E00AE8CF8 /*
play_mode_1_pressed.png in Resources */,
+ B3548D780B60188700AE8CF8 /*
play_mode_2_pressed.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -535,6 +610,21 @@
37DCF89908886A2800DBF422 /*
ffwd_button_on.png in Resources */,
378749400891B7A60068D97D /* Fonts in
Resources */,
371878830B2334890096E1ED /*
External_Binaries in Resources */,
+ B35D63FB0B5EDF8400131ACB /*
scrub_bg_center.tif in Resources */,
+ B35D63FE0B5EDFB700131ACB /*
scrub_bg_left.tif in Resources */,
+ B35D64010B5EDFBC00131ACB /*
scrub_bg_right.tif in Resources */,
+ B35D64150B5EE63400131ACB /*
vidbevel_bottom.tif in Resources */,
+ B35D64180B5EE63A00131ACB /*
vidbevel_sides.tif in Resources */,
+ B35D641B0B5EE64000131ACB /*
vidbevel_top.tif in Resources */,
+ B35D647D0B5F00FE00131ACB /*
volume_high.tif in Resources */,
+ B35D64800B5F010200131ACB /*
volume_low.tif in Resources */,
+ B35D649E0B5F100600131ACB /*
fullscreen.png in Resources */,
+ B35D64B00B5F138200131ACB /*
playlist.tif in Resources */,
+ B3548D580B5F95AA00AE8CF8 /*
buttonbg.tiff in Resources */,
+ B3548D5F0B5F973300AE8CF8 /*
info_pressed.png in Resources */,
+ B3548D630B6015E700AE8CF8 /*
play_mode_0_pressed.png in Resources */,
+ B3548D740B60187E00AE8CF8 /*
play_mode_1_pressed.png in Resources */,
+ B3548D770B60188700AE8CF8 /*
play_mode_2_pressed.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -721,7 +811,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.3;
SDKROOT = /Developer/SDKs/
MacOSX10.4u.sdk;
YACC_GENERATE_DEBUGGING_DIRECTIVES =
YES;
- ZERO_LINK = YES;
+ ZERO_LINK = NO;
};
name = Debug;
};
@@ -735,6 +825,7 @@
GCC_MODEL_TUNING = G3;
MACOSX_DEPLOYMENT_TARGET = 10.3;
SDKROOT = /Developer/SDKs/
MacOSX10.4u.sdk;
+ ZERO_LINK = NO;
};
name = Release;
};
Index: Resources/Graphics/play_mode_0.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Resources/Graphics/play_mode_1.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Resources/Graphics/play_mode_2.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Resources/Graphics/info.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Resources/English.lproj/MainMenu.nib/info.nib
===================================================================
--- Resources/English.lproj/MainMenu.nib/info.nib (revision 128)
+++ Resources/English.lproj/MainMenu.nib/info.nib (working copy)
@@ -3,23 +3,23 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>446 64 678 380 0 0 1280 1002 </string>
+ <string>619 93 678 380 0 0 1680 1028 </string>
<key>IBEditorPositions</key>
<dict>
<key>2107</key>
- <string>381 461 261 74 0 0 1024 746 </string>
+ <string>732 648 261 74 0 0 1680 1028 </string>
<key>2126</key>
- <string>460 470 104 56 0 0 1024 746 </string>
+ <string>818 649 88 72 0 0 1680 1028 </string>
<key>2170</key>
<string>482 457 60 82 0 0 1024 746 </string>
<key>2179</key>
- <string>482 457 60 82 0 0 1024 746 </string>
+ <string>832 644 60 82 0 0 1680 1028 </string>
<key>2188</key>
<string>482 537 50 72 0 0 1024 746 </string>
<key>2197</key>
<string>487 462 50 72 0 0 1024 746 </string>
<key>29</key>
- <string>168 899 371 44 0 0 1280 1002 </string>
+ <string>242 923 371 44 0 0 1680 1028 </string>
</dict>
<key>IBFramework Version</key>
<string>446.1</string>
@@ -35,20 +35,11 @@
<array>
<integer>944</integer>
<integer>29</integer>
+ <integer>1283</integer>
+ <integer>1816</integer>
+ <integer>2126</integer>
</array>
<key>IBSystem Version</key>
- <string>8G1454</string>
- <key>IBUserGuides</key>
- <dict>
- <key>1283</key>
- <dict>
- <key>guideLocations</key>
- <array>
- <string>Vertical:271.000000</string>
- </array>
- <key>guidesLocked</key>
- <false/>
- </dict>
- </dict>
+ <string>8L127</string>
</dict>
</plist>
Index: Resources/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
More information about the MPlayer-dev-eng
mailing list