Author: duncan
Date: Tue Dec 25 17:07:20 2007
New Revision: 10240
Log:
[ 1857456 ] [PATCH] one-key shutdown confirmation
Patch from Michel Lespinasse applied
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/Docs/CREDITS
branches/rel-1-7/freevo/src/plugins/shutdown.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/Docs/CREDITS
branches/rel-1/freevo/src/plugins/shutdown.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Tue Dec 25 17:07:20 2007
@@ -18,6 +18,7 @@
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
+ * Updated shut down to allow single key confirmation (F#1857456)
* Fixed oneclick weather plug-in to allow non-ascii location names (B#1856597)
* Fixed web server favorites and edit_favorite to use name and duplicate
detection (B#1857394)
Modified: branches/rel-1-7/freevo/Docs/CREDITS
==============================================================================
--- branches/rel-1-7/freevo/Docs/CREDITS (original)
+++ branches/rel-1-7/freevo/Docs/CREDITS Tue Dec 25 17:07:20 2007
@@ -66,8 +66,11 @@
Occasional contributors:
------------------------
+Michel Lespinasse <walken at zoy.org>
+o Various fixes
+
James Trietsch <kerosel at yahoo.com>
-o Various webserver fixes
+o Various webserver and recording fixes
Sylvain Fabre <centraladmin at lahiette.com>
o French DVD trailer grabber
Modified: branches/rel-1-7/freevo/src/plugins/shutdown.py
==============================================================================
--- branches/rel-1-7/freevo/src/plugins/shutdown.py (original)
+++ branches/rel-1-7/freevo/src/plugins/shutdown.py Tue Dec 25 17:07:20 2007
@@ -151,7 +151,8 @@
"""
self.menuw = menuw
what = _('Do you really want to shut down Freevo?')
- ConfirmBox(text=what, handler=self.shutdown_freevo,
default_choice=1).show()
+ ConfirmBox(text=what, handler=self.shutdown_freevo,
+ default_choice=config.SHUTDOWN_CONFIRM-1).show()
def confirm_system(self, arg=None, menuw=None):
@@ -160,7 +161,9 @@
"""
self.menuw = menuw
what = _('Do you really want to shut down the system?')
- ConfirmBox(text=what, handler=self.shutdown_system,
default_choice=1).show()
+ ConfirmBox(text=what, handler=self.shutdown_system,
+ default_choice=config.SHUTDOWN_CONFIRM-1).show()
+
def confirm_system_restart(self, arg=None, menuw=None):
"""
@@ -168,8 +171,8 @@
"""
self.menuw = menuw
what = _('Do you really want to restart the system?')
- ConfirmBox(text=what, handler=self.shutdown_system_restart,
default_choice=1).show()
-
+ ConfirmBox(text=what, handler=self.shutdown_system_restart,
+ default_choice=config.SHUTDOWN_CONFIRM-1).show()
def shutdown_freevo(self, arg=None, menuw=None):
"""
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Tue Dec 25 17:07:20 2007
@@ -21,6 +21,7 @@
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
+ * Updated shut down to allow single key confirmation (F#1857456)
* Fixed oneclick weather plug-in to allow non-ascii location names (B#1856597)
* Fixed web server favorites and edit_favorite to use name and duplicate
detection (B#1857394)
Modified: branches/rel-1/freevo/Docs/CREDITS
==============================================================================
--- branches/rel-1/freevo/Docs/CREDITS (original)
+++ branches/rel-1/freevo/Docs/CREDITS Tue Dec 25 17:07:20 2007
@@ -66,8 +66,11 @@
Occasional contributors:
------------------------
+Michel Lespinasse <walken at zoy.org>
+o Various fixes
+
James Trietsch <kerosel at yahoo.com>
-o Various webserver fixes
+o Various webserver and recording fixes
Sylvain Fabre <centraladmin at lahiette.com>
o French DVD trailer grabber
Modified: branches/rel-1/freevo/src/plugins/shutdown.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/shutdown.py (original)
+++ branches/rel-1/freevo/src/plugins/shutdown.py Tue Dec 25 17:07:20 2007
@@ -151,7 +151,8 @@
"""
self.menuw = menuw
what = _('Do you really want to shut down Freevo?')
- ConfirmBox(text=what, handler=self.shutdown_freevo,
default_choice=1).show()
+ ConfirmBox(text=what, handler=self.shutdown_freevo,
+ default_choice=config.SHUTDOWN_CONFIRM-1).show()
def confirm_system(self, arg=None, menuw=None):
@@ -160,7 +161,9 @@
"""
self.menuw = menuw
what = _('Do you really want to shut down the system?')
- ConfirmBox(text=what, handler=self.shutdown_system,
default_choice=1).show()
+ ConfirmBox(text=what, handler=self.shutdown_system,
+ default_choice=config.SHUTDOWN_CONFIRM-1).show()
+
def confirm_system_restart(self, arg=None, menuw=None):
"""
@@ -168,8 +171,8 @@
"""
self.menuw = menuw
what = _('Do you really want to restart the system?')
- ConfirmBox(text=what, handler=self.shutdown_system_restart,
default_choice=1).show()
-
+ ConfirmBox(text=what, handler=self.shutdown_system_restart,
+ default_choice=config.SHUTDOWN_CONFIRM-1).show()
def shutdown_freevo(self, arg=None, menuw=None):
"""
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
