Fixed french translation

Changelog

@@ -1,12 +1,13 @@
 0.05 alpha 2
 ------------
-Fixed dock menu connections, and menu connections for play/stop/next/prev.
+Fixed dock menu connections, and menu connections for play, stop, next, and previous.
 Fixed bindings for tag/info drawer.
 Volume settings are now consistent across songs.
 Window remembers its location.
 Info button now turns off when manually dragging the info drawer closed.
 Fixed weirdness when displaying the info drawer after closing the window (via menu or keyboard shortcut). Performing Get info now makes the window visible.
 Added a donation menu item. ($)
+Clicking the text field now toggles Time Elapsed with Time Remaining.
 
 0.05 alpha 1
 ------------

Custom/ClickField.m

@@ -10,7 +10,7 @@
 {
 	if([theEvent type] == NSLeftMouseDown)
 	{
-		[soundController toggleShowTimeRemaining:self];
+		[self sendAction:[self action] to:[self target]];
 	}
 }
 

English.lproj/MainMenu.nib/info.nib

@@ -28,10 +28,10 @@
 	<integer>3</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>513</integer>
 		<integer>463</integer>
 		<integer>29</integer>
 		<integer>21</integer>
+		<integer>513</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8H14</string>

French.lproj/MainMenu.nib/classes.nib

@@ -4,17 +4,19 @@
             ACTIONS = {
                 addFiles = id; 
                 delEntries = id; 
+                donate = id; 
                 loadPlaylist = id; 
                 savePlaylist = id; 
                 savePlaylistAs = id; 
-                showInfo = id; 
+                toggleInfoDrawer = id; 
             }; 
             CLASS = AppController; 
             LANGUAGE = ObjC; 
             OUTLETS = {
                 addButton = NSButton; 
                 infoButton = NSButton; 
-                mainWindow = NSWindow; 
+                infoDrawer = NSDrawer; 
+                mainWindow = NSPanel; 
                 nextButton = NSButton; 
                 playButton = NSButton; 
                 playlistController = PlaylistController; 
@@ -54,6 +56,33 @@
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {CLASS = InfoController; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {CLASS = InfoView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
+        {
+            ACTIONS = {
+                changeVolume = id; 
+                next = id; 
+                pause = id; 
+                pauseResume = id; 
+                play = id; 
+                playPauseResume = id; 
+                prev = id; 
+                resume = id; 
+                seek = id; 
+                stop = id; 
+                toggleShowTimeRemaining = id; 
+            }; 
+            CLASS = PlaybackController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                bitrateField = NSTextField; 
+                lengthField = NSTextField; 
+                playButton = NSButton; 
+                playlistController = PlaylistController; 
+                playlistView = PlaylistView; 
+                positionSlider = TrackingSlider; 
+                timeField = NSTextField; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
         {
             ACTIONS = {takeRepeatFromObject = id; takeShuffleFromObject = id; }; 
             CLASS = PlaylistController; 
@@ -64,7 +93,10 @@
         {
             CLASS = PlaylistView; 
             LANGUAGE = ObjC; 
-            OUTLETS = {playlistController = PlaylistController; soundController = SoundController; }; 
+            OUTLETS = {
+                playbackController = PlaybackController; 
+                playlistController = PlaylistController; 
+            }; 
             SUPERCLASS = NSTableView; 
         }, 
         {

French.lproj/MainMenu.nib/info.nib

@@ -3,29 +3,28 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>108 200 356 240 0 0 1280 938 </string>
+	<string>36 273 625 294 0 0 1024 746 </string>
 	<key>IBEditorPositions</key>
 	<dict>
 		<key>29</key>
-		<string>335 861 394 44 0 0 1280 938 </string>
+		<string>335 923 394 44 0 0 1280 1002 </string>
 		<key>463</key>
 		<string>484 555 312 249 0 0 1280 1002 </string>
 		<key>513</key>
-		<string>608 220 166 106 0 0 1280 1002 </string>
+		<string>513 509 166 106 0 0 1024 746 </string>
 	</dict>
 	<key>IBFramework Version</key>
-	<string>439.0</string>
+	<string>443.0</string>
 	<key>IBLockedObjects</key>
 	<array>
 		<integer>484</integer>
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>29</integer>
-		<integer>280</integer>
 		<integer>21</integer>
+		<integer>513</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8C46</string>
+	<string>8H14</string>
 </dict>
 </plist>

Playlist/PlaylistController.m

@@ -263,9 +263,8 @@
 	if (shuffle == YES)
 	{
 		int i = shuffleIndex;
-		
 		i += offset;
-		
+//		NSLog(@"SHUFFLE: %i %i %i %i", i, shuffleIndex, offset, [shuffleList count]);
 		while (i < 0)
 		{
 			if (repeat == YES)
@@ -283,6 +282,7 @@
 		{
 			if (repeat == YES)
 			{
+				NSLog(@"Adding shuffled list to back!");
 				[self addShuffledListToBack];
 			}
 			else
@@ -326,6 +326,9 @@
 	if (pe == nil)
 		return NO;
 	
+	if (shuffle == YES)
+		shuffleIndex++;
+	
 	[self setCurrentEntry:pe];
 	
 	return YES;
@@ -352,24 +355,22 @@
 	NSArray *newList = [Shuffle shuffleList:[self arrangedObjects]];
 	NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [newList count])];
 	
-	[self insertObjects:newList atArrangedObjectIndexes:indexSet];
+	[shuffleList insertObjects:newList atIndexes:indexSet];
-
-	[newList release];
 }
 
 - (void)addShuffledListToFront
 {
 	NSArray *newList = [Shuffle shuffleList:[self arrangedObjects]];
-	NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([[self arrangedObjects] count], [newList count])];
+	NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([shuffleList count], [newList count])];
-	
+	NSLog(@"%@", newList);
-	[self insertObjects:newList atArrangedObjectIndexes:indexSet];
+	[shuffleList insertObjects:newList atIndexes:indexSet];
-	
-	[newList release];
 }
 
 - (void)resetShuffleList
 {
 	[shuffleList removeAllObjects];
+	[self addShuffledListToFront];
+	
 	shuffleIndex = 0;
 }