Author: duncan
Date: Tue Oct 24 15:07:05 2006
New Revision: 8463
Modified:
branches/rel-1-6/freevo/src/plugins/command.py
Log:
Removed evil tabs and cvs log
Modified: branches/rel-1-6/freevo/src/plugins/command.py
==============================================================================
--- branches/rel-1-6/freevo/src/plugins/command.py (original)
+++ branches/rel-1-6/freevo/src/plugins/command.py Tue Oct 24 15:07:05 2006
@@ -13,20 +13,6 @@
# Todo: find a way to prompt for arguments. interactive display of output?
#
# -----------------------------------------------------------------------
-# $Log$
-# Revision 1.13.2.1 2004/08/28 17:08:55 dischi
-# doc fix
-#
-# Revision 1.13 2004/07/10 12:33:40 dischi
-# header cleanup
-#
-# Revision 1.12 2004/06/11 00:35:57 mikeruelle
-# move config method to where it can do some good
-#
-# Revision 1.11 2004/05/30 18:28:15 dischi
-# More event / main loop cleanup. rc.py has a changed interface now
-#
-# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
# Copyright (C) 2003 Krister Lagerstrom, et al.
# Please see the file freevo/Docs/CREDITS for a complete list of authors.
@@ -45,7 +31,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
+# -----------------------------------------------------------------------
#python modules
@@ -211,13 +197,13 @@
"""
def __init__(self, command=None, directory=None):
Item.__init__(self, skin_type='commands')
- self.display_type = 'commands'
- self.stoposd = False
- self.use_wm = False
- self.spawnwm = config.COMMAND_SPAWN_WM
- self.killwm = config.COMMAND_KILL_WM
+ self.display_type = 'commands'
+ self.stoposd = False
+ self.use_wm = False
+ self.spawnwm = config.COMMAND_SPAWN_WM
+ self.killwm = config.COMMAND_KILL_WM
self.stdout = True
- if command and directory:
+ if command and directory:
self.name = command
self.cmd = os.path.join(directory, command)
self.image = util.getimage(self.cmd)
@@ -235,30 +221,30 @@
start popup and execute command
"""
if self.stoposd:
- if self.use_wm:
- os.system(self.spawnwm)
- else:
+ if self.use_wm:
+ os.system(self.spawnwm)
+ else:
popup_string=_("Running Command...")
pop = PopupBox(text=popup_string)
pop.show()
- workapp = CommandChild(self.cmd, 'command', 1, self.stoposd)
- while workapp.isAlive():
+ workapp = CommandChild(self.cmd, 'command', 1, self.stoposd)
+ while workapp.isAlive():
# make sure all callbacks in rc are running
rc.poll()
# wait some time
- time.sleep(0.5)
+ time.sleep(0.5)
if self.stoposd:
- if self.use_wm:
- os.system(self.killwm)
- time.sleep(0.5)
- else:
+ if self.use_wm:
+ os.system(self.killwm)
+ time.sleep(0.5)
+ else:
pop.destroy()
- workapp.stop()
- message = ''
- if workapp.status:
- message = _('Command Failed')
+ workapp.stop()
+ message = ''
+ if workapp.status:
+ message = _('Command Failed')
else:
message = _('Command Completed')
@@ -313,7 +299,7 @@
if os.path.splitext(command)[1] in ('.jpg', '.png'):
continue
if os.path.splitext(command)[1] in ('.fxd', '.xml'):
- fxd_file=os.path.join(config.COMMANDS_DIR, command)
+ fxd_file=os.path.join(config.COMMANDS_DIR, command)
# create a basic fxd parser
parser = util.fxdparser.FXD(fxd_file)
@@ -326,7 +312,7 @@
# start the parsing
parser.parse()
- else:
+ else:
cmd_item = CommandItem(command, config.COMMANDS_DIR)
command_items.append(cmd_item)
@@ -369,7 +355,7 @@
return [ ('COMMANDS_DIR', '/usr/local/bin', 'The directory to show
commands from.'),
('COMMAND_SPAWN_WM', '', 'command to start window manager.'),
('COMMAND_KILL_WM', '', 'command to stop window manager.'),
- ]
+ ]
class fxdhandler(plugin.Plugin):
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
