[Jahshaka-cvs] jah/jahwidgets/src/qt3/python player.cpp, 1.21, 1.22 widget_handle.cpp, 1.8, 1.9

[tim <tim...@us...>]

Update of /cvsroot/jahshaka/jah/jahwidgets/src/qt3/python
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31424/src/qt3/python

Modified Files:
	player.cpp widget_handle.cpp 
Log Message:

jahwidgets
- moved full_screen code to widget_handle


Index: player.cpp
===================================================================
RCS file: /cvsroot/jahshaka/jah/jahwidgets/src/qt3/python/player.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- player.cpp	22 Sep 2006 13:18:11 -0000	1.21
+++ player.cpp	7 Feb 2007 10:47:13 -0000	1.22
@@ -51,11 +51,8 @@
 		MediaPtr find( int x, int y ) { return instance_->find( x,y ); }
 		MediaPtr get_active( ) { return instance_->get_active( ); }
 		void set_active( MediaPtr media ) { instance_->set_active( media ); }
-		void close( ) { instance_->close( ); }
-		void toggle_full_screen( ) { instance_->toggle_full_screen( ); }
 		int speed( ) { return instance_->speed( ); }
 		void set_speed( int speed ) { instance_->set_speed( speed ); }
-		void setAsMainWidget( ) { qApp->setMainWidget( instance_ ); }
 		int width( ) { return instance_->width( ); }
 		int height( ) { return instance_->height( ); }
 		void closeParentWindow( ) { instance_->closeParentWindow( ); }
@@ -83,7 +80,6 @@
 		.def( "__iter__", py::range( &qt3::player::begin, &qt3::player::end ) )
 		.def( "is_valid", &qt3::player::is_valid )
 		.def( "clear", &qt3::player::clear )
-		.def( "close", &qt3::player::close )
 		.def( "find", &qt3::player::find )
 		.def( "play", &qt3::player::play1 )
 		.def( "play", &qt3::player::play2 )
@@ -94,11 +90,8 @@
 		.def( "register_key_delegate", &qt3::player::register_key_delegate )
 		.def( "register_player_delegate", &qt3::player::register_player_delegate )
 		.def( "register_wheel_delegate", &qt3::player::register_wheel_delegate )
-		.def( "setAsMainWidget", &qt3::player::setAsMainWidget )
 		.def( "show", &qt3::player::show )
 		.def( "size", &qt3::player::size )
-		.def( "toggle_full_screen", &qt3::player::toggle_full_screen )
-		.def( "close_parent_window", &qt3::player::closeParentWindow )
 		.def( "set_channels", &qt3::player::set_channels )
 		.def( "set_histogram_channels", &qt3::player::set_histogram_channels )
 		.add_property( "active", &qt3::player::get_active, &qt3::player::set_active )

Index: widget_handle.cpp
===================================================================
RCS file: /cvsroot/jahshaka/jah/jahwidgets/src/qt3/python/widget_handle.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- widget_handle.cpp	12 Dec 2006 14:52:50 -0000	1.8
+++ widget_handle.cpp	7 Feb 2007 10:47:13 -0000	1.9
@@ -23,6 +23,7 @@
         .def( "valid", &jahwidgets::qt3::widget_handle::valid )
         .def( "show", &jahwidgets::qt3::widget_handle::show )
 	.def( "set_always_on_top", &jahwidgets::qt3::widget_handle::set_always_on_top )
+        .def( "toggle_full_screen", &jahwidgets::qt3::widget_handle::toggle_full_screen )
 	.def( "remove", &jahwidgets::qt3::widget_handle::remove )
 	.def( "register_drop_delegate", &jahwidgets::qt3::widget_handle::register_drop_delegate )
 	.def( "register_mouse_delegate", &jahwidgets::qt3::widget_handle::register_mouse_delegate )