Commit Graph

689 Commits

Author SHA1 Message Date
Bryan Schumaker fc6397dc43 Added Ocarina 4.3 Screenshots 2010-12-30 12:38:43 -05:00
Bryan Schumaker 6201f707cb Mark __dev__ as False
4.3 is almost done!
2010-12-30 11:26:20 -05:00
Bryan Schumaker f6b20e345a Use slash key to grab filter focus
This may be more natural to people familiar with vim.
2010-12-29 13:29:27 -05:00
Bryan Schumaker c17126553f web seeking
This patch adds the ability to seek forwards or backwards in a song
through the web controls.
2010-12-27 22:07:24 -05:00
Bryan Schumaker 2eb16793ca Clean up controls.html
This makes everything easier to read
2010-12-27 22:06:25 -05:00
Bryan Schumaker 6fc6bb60f6 Set play button status correctly when stopped
The stop function needs to return True if it is successful.
2010-12-27 19:09:07 -05:00
Bryan Schumaker ef5be29197 web: better controls
I split out the web controls to a new file, and can set the status of
the play button correctly when the page is loaded.  Finally, the
set_play_button() function is called on a timer so changes on the
application will be reflected on the web page eventually.
2010-12-27 19:00:27 -05:00
Bryan Schumaker 6fd7ea77a2 web: remove return value from send_request 2010-12-27 13:02:07 -05:00
Bryan Schumaker 3c2f4ac147 web: rename do_request to send_request 2010-12-27 13:01:48 -05:00
Bryan Schumaker f90c387652 web: controls use external utils.js
Using external javascript makes things easier to read and work with.
2010-12-27 13:01:00 -05:00
Bryan Schumaker 7455b408e6 web: set_attr_once()
The set_attr_once() function is the same as set_attr(), only it will
only set the value once.  Attributes like "version" should use this,
since the ocarina version shouldn't change often.
2010-12-27 12:49:19 -05:00
Bryan Schumaker 66a637815e utils.js: separate attr and id
I was using the attribute as the object id in the html page.  By
splitting the two, I can have the same attribute set in multiple places
on a single page independently.
2010-12-27 12:45:23 -05:00
Bryan Schumaker 7c7bf03d71 Set index.html attributes using utils.js 2010-12-27 12:42:22 -05:00
Bryan Schumaker 1b9af74cdc Added utils.js
The utils.js file is an external javascript file that will make it
easier to set attributes / do controls from more than one page.
2010-12-27 12:41:33 -05:00
Bryan Schumaker 9dadf082b4 Added uptime to web controls
Asking for the uptime control will return how long ocarina has been
running.
2010-12-27 12:40:40 -05:00
Bryan Schumaker 4a34ce51f1 Added uptime() to ocarina package
Calling this function will return an object representing the total
uptime of Ocarina.
2010-12-27 12:22:47 -05:00
Bryan Schumaker bdd9c331e8 Track startup time in ocarina/__init__.py
The ocarina package can track the startup time better than the launcher
script.  Tracking it in the package will also make startup time
available to other callers.
2010-12-27 12:19:22 -05:00
Bryan Schumaker 0c636bfd56 Clean up universal_open()
The cleaned up version chooses what function to call based on file
extention.  I use map.get() to pick a function, and use the open_music()
function as the default.
2010-12-27 12:06:22 -05:00
Bryan Schumaker 961eacf3c4 Began new library browser
The new library browser will eventually morph into a web-based clone of
the desktop Ocarina application.
2010-12-26 22:51:18 -05:00
Bryan Schumaker 805db95d05 add html/images directory
I thought this was already added?  I guess it wasn't.  Oops...
2010-12-26 12:29:29 -05:00
Bryan Schumaker bcdbd3dfc9 Rename web buttons
The stock_media-* style was too hard to work with.  The buttons have
been renamed in the following way:

stock_media-next.png  -> next.png
stock_media-pause.png -> pause.png
stock_media-play.png  -> play.png
stock_media-next.png  -> next.png
2010-12-26 12:27:52 -05:00
Bryan Schumaker 759342dc70 Attrs and icons
- Return improved attributes for artist / album / version
- Remove icons that were recently moved
2010-12-24 12:42:13 -05:00
Bryan Schumaker 3498c46130 Increase web get_attrs timeout
Every second was too much!  Do it every 3 seconds instead.
2010-12-24 12:41:26 -05:00
Bryan Schumaker 5a4aab5869 Change web server devel port
The development port is now 4243
2010-12-24 12:33:13 -05:00
Bryan Schumaker b81ba094fd Added attributes to web page
The attributes update every second to check for the current song.
2010-12-24 12:31:55 -05:00
Bryan Schumaker 0b8bc2d7fc Fix choosing random song when playlist is filtered
I was setting cur_index based on the index into the visible set, rather
than the index into the entire song list.
2010-12-23 09:53:30 -05:00
Bryan Schumaker 1c4621a79a Set random directly
This makes much more sense than toggling it.  Toggling caused an
inconsistent state during testing.
2010-12-23 09:51:09 -05:00
Bryan Schumaker 3802d41b83 Reorder tabs
This changes the order to Playlist, Queue, Library rather than Playlist,
Library, Queue
2010-12-23 09:48:39 -05:00
Bryan Schumaker 270d33d5ec Reset playlist before loading xspf file
Loading an xspf file should replace the current playlist, rather than
add to it.
2010-12-18 16:45:48 -05:00
Bryan Schumaker aa0f832356 Refresh the playlist after loading
After we load an xspf file, we should refresh the playlist to reflect
changes.
2010-12-18 16:44:18 -05:00
Bryan Schumaker da99d4b349 Load xspf playlists
This patch adds loading of xspf playlists
2010-12-18 16:39:17 -05:00
Bryan Schumaker 77f065b703 Export playlist to xspf
This patch adds support for saving a playlist as an xspf xml file.  I
only use the <location> tag to keep it simple.
2010-12-18 16:22:06 -05:00
Bryan Schumaker da1a5413a4 Library source subdirectory filtering
When we add a path to the sources list, we should remove all paths that
are a subdirectory of the new path.
2010-12-18 15:35:51 -05:00
Bryan Schumaker 8d423629be Add fewer library sources
If we are being asked to add a path that is a subdirectory of a current
library source then we shouldn't add it.
2010-12-18 15:28:53 -05:00
Bryan Schumaker 66a3344121 Controls pref initialization
The preferences variable should be initialized earlier to avoid an error
during startup.
2010-12-18 15:06:18 -05:00
Bryan Schumaker 3c2f40c69e Move backup.py -> export.py, import v1.3 library
The move was supposed to be in the previous patch ... oops.

This one also adds in importing a v1.3 library xml file.
2010-12-18 15:03:24 -05:00
Bryan Schumaker f869b17e2f Rename backup functions
Backup has been renamed to export
Restore has been renamed to import_xml
2010-12-18 14:52:31 -05:00
Bryan Schumaker c08655c1fa More reformatting and comments 2010-12-18 14:49:35 -05:00
Bryan Schumaker c49a39ad46 Encode v1.3 library
This patch changes the encode functions to export a v1.3 library
2010-12-18 14:46:31 -05:00
Bryan Schumaker cafc19fbed Don't set score when importing library
The score system has been replaced with a like / dislike system.  Score
is no longer an attribute that can be set.
2010-12-18 14:36:21 -05:00
Bryan Schumaker 8349efe8c7 Library export formatting changes
This patch rearranges the decode functions to put decoders for a single
version together.  I also removed some extra whitespace and clearly
labeled the decoding sections.
2010-12-18 14:33:17 -05:00
Bryan Schumaker 29152aca1d ToggleButton generic toggled signal
The ToggleButton should automatically respond to the toggled signal
2010-12-18 11:19:55 -05:00
Bryan Schumaker d8c5814f5a ToggleButton tooltip 2010-12-18 11:17:58 -05:00
Bryan Schumaker e1a709b6c3 Create ToggleButton class
The ToggleButton class is a base class for buttons to inherit from.  So
far, this is only the RandomButton, LikeButton, and DislikeButton
2010-12-18 11:15:12 -05:00
Bryan Schumaker 44ee38dd91 Remove pointless whitespace 2010-12-18 11:10:45 -05:00
Bryan Schumaker a0d231e964 Move RandomButton()
This puts it closer to the like / dislike buttons, since they are all
toggle buttons
2010-12-18 11:09:41 -05:00
Bryan Schumaker 05297d850c Remove unused code from like / dislike buttons 2010-12-18 11:08:37 -05:00
Bryan Schumaker a1293fb351 Draw like / dislike buttons
This patch adds the like and dislike buttons to the gui.
2010-12-18 11:05:53 -05:00
Bryan Schumaker 47dbd200ab Add like / dislike buttons
This patch adds buttons for liking and disliking a song.  I also use
this patch to add like / dislike icons.
2010-12-18 11:05:17 -05:00
Bryan Schumaker 0eb3a15783 Add functions for controlling "like"
This patch adds a function for getting the "like" status of the current
song.  It also changes the "set_like" function to use an event, rather
than just setting it.
2010-12-18 11:03:25 -05:00