diff --git a/Changelog b/Changelog
index 45d0ac53c..fc1290de7 100644
--- a/Changelog
+++ b/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
------------
diff --git a/Custom/ClickField.m b/Custom/ClickField.m
index 7e0e1fb2f..19005df37 100644
--- a/Custom/ClickField.m
+++ b/Custom/ClickField.m
@@ -10,7 +10,7 @@
{
if([theEvent type] == NSLeftMouseDown)
{
- [soundController toggleShowTimeRemaining:self];
+ [self sendAction:[self action] to:[self target]];
}
}
diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib
index fda658cf4..9b92f27e8 100644
--- a/English.lproj/MainMenu.nib/info.nib
+++ b/English.lproj/MainMenu.nib/info.nib
@@ -28,10 +28,10 @@
3
IBOpenObjects
- 513
463
29
21
+ 513
IBSystem Version
8H14
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index bd3dbe8f2..4f8c02aeb 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/French.lproj/MainMenu.nib/classes.nib b/French.lproj/MainMenu.nib/classes.nib
index 685e28de3..3e7ff796e 100644
--- a/French.lproj/MainMenu.nib/classes.nib
+++ b/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;
},
{
diff --git a/French.lproj/MainMenu.nib/info.nib b/French.lproj/MainMenu.nib/info.nib
index a9f51790b..4f19caf32 100644
--- a/French.lproj/MainMenu.nib/info.nib
+++ b/French.lproj/MainMenu.nib/info.nib
@@ -3,29 +3,28 @@
IBDocumentLocation
- 108 200 356 240 0 0 1280 938
+ 36 273 625 294 0 0 1024 746
IBEditorPositions
29
- 335 861 394 44 0 0 1280 938
+ 335 923 394 44 0 0 1280 1002
463
484 555 312 249 0 0 1280 1002
513
- 608 220 166 106 0 0 1280 1002
+ 513 509 166 106 0 0 1024 746
IBFramework Version
- 439.0
+ 443.0
IBLockedObjects
484
IBOpenObjects
- 29
- 280
21
+ 513
IBSystem Version
- 8C46
+ 8H14
diff --git a/French.lproj/MainMenu.nib/keyedobjects.nib b/French.lproj/MainMenu.nib/keyedobjects.nib
index 956d4315a..50f610665 100644
Binary files a/French.lproj/MainMenu.nib/keyedobjects.nib and b/French.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index e5a02f408..c63aecada 100644
--- a/Playlist/PlaylistController.m
+++ b/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];
-
- [newList release];
+ [shuffleList insertObjects:newList atIndexes:indexSet];
}
- (void)addShuffledListToFront
{
NSArray *newList = [Shuffle shuffleList:[self arrangedObjects]];
- NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([[self arrangedObjects] count], [newList count])];
-
- [self insertObjects:newList atArrangedObjectIndexes:indexSet];
-
- [newList release];
+ NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([shuffleList count], [newList count])];
+ NSLog(@"%@", newList);
+ [shuffleList insertObjects:newList atIndexes:indexSet];
}
- (void)resetShuffleList
{
[shuffleList removeAllObjects];
+ [self addShuffledListToFront];
+
shuffleIndex = 0;
}