[Quake2world-dev] r608 - pymp/trunk
fsx at jdolan.dyndns.org
fsx at jdolan.dyndns.org
Sun Aug 9 16:38:59 UTC 2009
Author: fsx
Date: 2009-08-09 16:38:59 +0000 (Sun, 09 Aug 2009)
New Revision: 608
Modified:
pymp/trunk/control.py
pymp/trunk/menu.py
pymp/trunk/playlist.py
pymp/trunk/pymp.py
pymp/trunk/systray.py
Log:
Some small code changes.
Modified: pymp/trunk/control.py
===================================================================
--- pymp/trunk/control.py 2009-08-08 01:34:49 UTC (rev 607)
+++ pymp/trunk/control.py 2009-08-09 16:38:59 UTC (rev 608)
@@ -3,7 +3,6 @@
import pango, pygtk, gtk
HPADDING, VPADDING, PROG_WIDTH, PROG_HEIGHT = 12, 2, 150, 10
-
SEEK_STEP = 10
#
@@ -111,9 +110,9 @@
selection = self.pymp.playlist.view.get_selection()
model, paths = selection.get_selected_rows()
- if paths: self.pymp.playlist.play(paths[0]) #play selected
+ if paths: self.pymp.playlist.play(paths[0]) # Play selected
elif self.current: self.pymp.playlist.play(self.pymp.playlist.path()) #or current
- else: self.pymp.playlist.jump(0) #or jump, play something
+ else: self.pymp.playlist.jump(0) # Pr jump, play something
else:
self.pymp.mplayer.pause()
@@ -150,12 +149,12 @@
#
def seekPercent(self, widget, event):
- x, y = event.get_coords() #resolve desired percent
+ x, y = event.get_coords() # Resolve desired percent
percent = 100 * x / PROG_WIDTH
self.pymp.mplayer.seek(percent, 1)
- if self.pymp.mplayer.mplayerIn: #little cheat
+ if self.pymp.mplayer.mplayerIn: # Little cheat
self.setProgress(int(percent))
return True
@@ -165,17 +164,17 @@
#
def setProgress(self, percent=-1, time=-1):
- if percent == -1: #clear bar, return
+ if percent == -1: # Clear bar, return
self.progBar.set_fraction(0)
self.progBar.set_text("")
return
self.progBar.set_fraction(percent / 100.0)
- if time > -1: #use time for mplayers that support it
+ if time > -1: # Use time for mplayers that support it
minutes, seconds = int(time / 60), int(time % 60)
self.progBar.set_text("%d:%02d" % (minutes, seconds))
- else: #or fall back on percent for old mplayers
+ else: # Or fall back on percent for old mplayers
self.progBar.set_text(str(percent) + "%")
#
@@ -189,7 +188,7 @@
playlist.clear()
playlist.dragReceived(view, context, x, y, data, info, t)
- if playlist.continuous: #and begin playback
+ if playlist.continuous: # And begin playback
return playlist.jump(0)
return True
Modified: pymp/trunk/menu.py
===================================================================
--- pymp/trunk/menu.py 2009-08-08 01:34:49 UTC (rev 607)
+++ pymp/trunk/menu.py 2009-08-09 16:38:59 UTC (rev 608)
@@ -117,12 +117,12 @@
flags = gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT
- buttons = ( #define okay and cancel buttons
+ buttons = ( # Define okay and cancel buttons
gtk.STOCK_OK, gtk.RESPONSE_ACCEPT,
gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT
)
- entry = gtk.Entry(255) #create text entry field
+ entry = gtk.Entry(255) # Create text entry field
entry.set_activates_default(True)
entry.set_width_chars(40)
entry.show()
@@ -132,7 +132,7 @@
dialog.vbox.pack_start(entry, False, True, 0)
- if dialog.run() == gtk.RESPONSE_ACCEPT: #process location
+ if dialog.run() == gtk.RESPONSE_ACCEPT: # Process location
self.pymp.playlist.load([entry.get_text()])
dialog.destroy()
@@ -145,7 +145,7 @@
SELECT_ALL = 1234
ADD = 0
- buttons = ( #define open and cancel buttons
+ buttons = ( # Define open and cancel buttons
"Select All", SELECT_ALL,
"Add", ADD,
gtk.STOCK_OPEN, gtk.RESPONSE_ACCEPT,
@@ -153,7 +153,7 @@
)
fileChooser = gtk.FileChooserDialog(self.pymp.versionString,
- self.pymp.window, 0, buttons) #create chooser
+ self.pymp.window, 0, buttons) # Create chooser
fileChooser.set_default_response(gtk.RESPONSE_ACCEPT)
fileChooser.set_current_folder(self.path)
@@ -163,26 +163,26 @@
response = fileChooser.run()
- if response == SELECT_ALL: #select all and continune
+ if response == SELECT_ALL: # Select all and continune
fileChooser.select_all()
continue
- if response == gtk.RESPONSE_ACCEPT: #process selected files
+ if response == gtk.RESPONSE_ACCEPT: # Process selected files
self.pymp.playlist.load(fileChooser.get_filenames())
self.path = fileChooser.get_current_folder()
- if response == ADD: #We can add songs without closing
+ if response == ADD: # We can add songs without closing
- for f in fileChooser.get_filenames(): #load files or lists
+ for f in fileChooser.get_filenames(): # Load files or lists
self.pymp.playlist.add(f)
self.path = fileChooser.get_current_folder()
continue
- break #break from loop
+ break # Break from loop
- fileChooser.destroy() #dispose of chooser
+ fileChooser.destroy() # Dispose of chooser
return True
#
@@ -229,11 +229,9 @@
model.set_sort_column_id(col, gtk.SORT_ASCENDING)
model.sort_column_changed()
- pl = self.pymp.playlist
+ if self.pymp.playlist.current: # Scroll to current, may have moved offscreen
+ self.pymp.playlist.view.scroll_to_cell(self.pymp.playlist.path())
- if pl.current: #scroll to current, may have moved offscreen
- pl.view.scroll_to_cell(pl.path())
-
self.sort = col
return True
@@ -265,12 +263,12 @@
flags = gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT
- buttons = ( #define okay and cancel buttons
+ buttons = ( # Define okay and cancel buttons
gtk.STOCK_OK, gtk.RESPONSE_ACCEPT,
gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT
)
- buff = gtk.TextBuffer() #create text entry field
+ buff = gtk.TextBuffer() # Create text entry field
if os.path.isfile(MPLAYERCONFFILE):
config = open(MPLAYERCONFFILE)
Modified: pymp/trunk/playlist.py
===================================================================
--- pymp/trunk/playlist.py 2009-08-08 01:34:49 UTC (rev 607)
+++ pymp/trunk/playlist.py 2009-08-09 16:38:59 UTC (rev 608)
@@ -50,7 +50,7 @@
self.random = pymp.prefs.getBool("random")
self.repeat = pymp.prefs.getBool("repeat")
- #tid, target, ctime, atime, title, font weight, weight set
+ # tid, target, ctime, atime, title, font weight, weight set
model = gtk.ListStore(int, str, int, int, str, int, bool)
model.set_sort_func(COL_TARGET, compare)
@@ -59,7 +59,7 @@
model.set_sort_func(COL_TITLE, compare)
renderer = gtk.CellRendererText()
- column = gtk.TreeViewColumn(None, renderer, #initialize display column
+ column = gtk.TreeViewColumn(None, renderer, # Initialize display column
text=COL_TITLE, weight=COL_WEIGHT, weight_set=COL_WEIGHT_SET)
view = gtk.TreeView(model)
@@ -72,11 +72,10 @@
view.set_size_request(MIN_WIDTH, MIN_HEIGHT)
view.set_headers_visible(False)
- target = [("text/uri-list", 0, 0)] #external drag/drop
+ target = [("text/uri-list", 0, 0)] # External drag/drop
view.drag_dest_set(gtk.DEST_DEFAULT_ALL, target, gtk.gdk.ACTION_COPY)
view.connect("drag-data-received", self.dragReceived)
-
view.connect("button-press-event", self.menu)
view.connect("row-activated", self.activate)
view.connect("key-press-event", self.key)
Modified: pymp/trunk/pymp.py
===================================================================
--- pymp/trunk/pymp.py 2009-08-08 01:34:49 UTC (rev 607)
+++ pymp/trunk/pymp.py 2009-08-09 16:38:59 UTC (rev 608)
@@ -1,7 +1,6 @@
#!/usr/bin/env python
import sys, os, fcntl, pygtk, gtk, gobject, time
-
import prefs, menu, remote, playlist, control, mplayer, systray
HOME = os.path.expanduser("~/.pymp")
@@ -22,7 +21,7 @@
def getIcon(self):
icons = [sys.path[0] + "/../../share/pixmaps/pymp.png",
- "./pymp.png"] #for development
+ "./pymp.png"] # For development
for icon in icons:
if os.access(icon, os.F_OK):
@@ -52,7 +51,7 @@
#
def __init__(self, targets):
- window = gtk.Window(gtk.WINDOW_TOPLEVEL) #create window
+ window = gtk.Window(gtk.WINDOW_TOPLEVEL) # Create window
window.connect("destroy", self.quit)
window.set_title(self.versionString)
window.set_icon(self.getIcon())
@@ -71,20 +70,19 @@
vbox.pack_start(self.playlist.scrollview, True, True, 0)
vbox.pack_start(self.control.hbox, False, False, 0)
- window.add(vbox) #prepare to start ui
+ window.add(vbox) # Prepare to start ui
window.show_all()
window.move(self.prefs.getInt("x"), self.prefs.getInt("y"))
window.resize(self.prefs.getInt("width"), self.prefs.getInt("height"))
- if targets: #process targets
-
+ if targets: # Process targets
self.playlist.load(targets)
- if self.playlist.continuous: #and begin playback
+ if self.playlist.continuous: # And begin playback
self.playlist.jump(0)
- else: #or load last list
+ else: # Or load last list
self.playlist.loadm3u()
window.connect("configure-event", self.cb_store_position)
@@ -92,16 +90,16 @@
gtk.main()
#
-# Ensure preferenecs directory exists and create Pymp instance.
+# Ensure preferences directory exists and create Pymp instance.
#
def main():
if not os.access(HOME, os.F_OK | os.W_OK):
- os.mkdir(HOME) #create prefs directory
+ os.mkdir(HOME) # Create prefs directory
if not remote.remote(sys.argv):
- Pymp(sys.argv[1:]) #create new Pymp
+ Pymp(sys.argv[1:]) # Create new Pymp
-main() #start the program
+main() # Start the program
#End of file
Modified: pymp/trunk/systray.py
===================================================================
--- pymp/trunk/systray.py 2009-08-08 01:34:49 UTC (rev 607)
+++ pymp/trunk/systray.py 2009-08-09 16:38:59 UTC (rev 608)
@@ -43,6 +43,7 @@
# Icon
self.staticon = gtk.StatusIcon()
self.staticon.set_from_pixbuf(self.getTrayIcon())
+ self.staticon.set_tooltip(self.pymp.versionString)
self.staticon.connect('activate', self.cb_activate_icon)
self.staticon.connect('popup-menu', self.cb_popup_menu, menu)
More information about the Quake2World-dev
mailing list