fix some gtk bug...

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6147 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 104 insertions, 73 deletions

diff --git a/Gui/mplayer/gtk/about.c b/Gui/mplayer/gtk/about.c
index 058586b70b..23e69175dc 100644
--- a/Gui/mplayer/gtk/about.c
+++ b/Gui/mplayer/gtk/about.c
@@ -7,8 +7,24 @@
 #include "../widgets.h"
 #include "about.h"
 
+int gtkVAboutBox = 0;
+GtkWidget * AboutBox;
+
+void ShowAboutBox( void )
+{
+ if ( gtkVAboutBox ) gtkActive( AboutBox );
+   else AboutBox=create_About();
+ gtk_widget_show( AboutBox );
+}
+
+void ab_AboutBox_show( GtkButton * button,gpointer user_data )
+{ gtkVAboutBox=(int)user_data; }
+
 void ab_Ok_released( GtkButton * button,gpointer user_data )
-{ gtk_widget_destroy( AboutBox ); }
+{
+ gtkVAboutBox=(int)user_data; 
+ gtk_widget_destroy( AboutBox );
+}
 
 GtkWidget * create_About( void )
 {
@@ -32,7 +48,7 @@ GtkWidget * create_About( void )
 
   GtkAccelGroup * accel_group;
 
-  accel_group=gtk_accel_group_new( );
+  accel_group=gtk_accel_group_new();
 
   About=gtk_window_new( GTK_WINDOW_TOPLEVEL );
   gtk_widget_set_name( About,MSGTR_About );
@@ -45,7 +61,7 @@ GtkWidget * create_About( void )
   frame1=gtk_frame_new( NULL );
   gtk_widget_set_name( frame1,"frame1" );
   gtk_widget_ref( frame1 );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"frame1",frame1,( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"frame1",frame1,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( frame1 );
   gtk_container_add( GTK_CONTAINER( About ),frame1 );
   gtk_frame_set_shadow_type( GTK_FRAME( frame1 ),GTK_SHADOW_IN );
@@ -53,7 +69,7 @@ GtkWidget * create_About( void )
   frame2=gtk_frame_new( NULL );
   gtk_widget_set_name( frame2,"frame2" );
   gtk_widget_ref( frame2 );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"frame2",frame2,( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"frame2",frame2,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( frame2 );
   gtk_container_add( GTK_CONTAINER( frame1 ),frame2 );
   gtk_frame_set_shadow_type( GTK_FRAME( frame2 ),GTK_SHADOW_NONE );
@@ -61,7 +77,7 @@ GtkWidget * create_About( void )
   frame3=gtk_frame_new( NULL );
   gtk_widget_set_name( frame3,"frame3" );
   gtk_widget_ref( frame3 );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"frame3",frame3,( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"frame3",frame3,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( frame3 );
   gtk_container_add( GTK_CONTAINER( frame2 ),frame3 );
   gtk_frame_set_shadow_type( GTK_FRAME( frame3 ),GTK_SHADOW_ETCHED_OUT );
@@ -69,7 +85,7 @@ GtkWidget * create_About( void )
   frame4=gtk_frame_new( NULL );
   gtk_widget_set_name( frame4,"frame4" );
   gtk_widget_ref( frame4 );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"frame4",frame4,( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"frame4",frame4,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( frame4 );
   gtk_container_add( GTK_CONTAINER( frame3 ),frame4 );
   gtk_frame_set_shadow_type( GTK_FRAME( frame4 ),GTK_SHADOW_NONE );
@@ -77,7 +93,7 @@ GtkWidget * create_About( void )
   vbox1=gtk_vbox_new( FALSE,0 );
   gtk_widget_set_name( vbox1,"vbox1" );
   gtk_widget_ref( vbox1 );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"vbox1",vbox1,( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"vbox1",vbox1,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( vbox1 );
   gtk_container_add( GTK_CONTAINER( frame4 ),vbox1 );
 
@@ -87,7 +103,7 @@ GtkWidget * create_About( void )
 
   gtk_widget_set_name( pixmap1,"pixmap1" );
   gtk_widget_ref( pixmap1 );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"pixmap1",pixmap1,( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"pixmap1",pixmap1,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( pixmap1 );
   gtk_box_pack_start( GTK_BOX( vbox1 ),pixmap1,FALSE,FALSE,0 );
   gtk_widget_set_usize( pixmap1,-2,174 );
@@ -95,7 +111,7 @@ GtkWidget * create_About( void )
   hseparator2=gtk_hseparator_new( );
   gtk_widget_set_name( hseparator2,"hseparator2" );
   gtk_widget_ref( hseparator2 );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"hseparator2",hseparator2,( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"hseparator2",hseparator2,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( hseparator2 );
   gtk_box_pack_start( GTK_BOX( vbox1 ),hseparator2,FALSE,FALSE,0 );
   gtk_widget_set_usize( hseparator2,-2,7 );
@@ -103,7 +119,7 @@ GtkWidget * create_About( void )
   scrolledwindow1=gtk_scrolled_window_new( NULL,NULL );
   gtk_widget_set_name( scrolledwindow1,"scrolledwindow1" );
   gtk_widget_ref( scrolledwindow1 );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"scrolledwindow1",scrolledwindow1,( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"scrolledwindow1",scrolledwindow1,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( scrolledwindow1 );
   gtk_box_pack_start( GTK_BOX( vbox1 ),scrolledwindow1,TRUE,TRUE,0 );
   gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC );
@@ -111,69 +127,83 @@ GtkWidget * create_About( void )
   AboutText=gtk_text_new( NULL,NULL );
   gtk_widget_set_name( AboutText,"AboutText" );
   gtk_widget_ref( AboutText );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"AboutText",AboutText,( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"AboutText",AboutText,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( AboutText );
   gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
   gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
-                   "\nMPlayer code:\n" \
-                   "       fileformat detection,demuxers - A'rpi\n" \
-                   "       DVD support - ( alpha version was: LGB ) now: ?\n" \
-                   "       network streaming - Bertrand BAUDET\n" \
-                   "       A-V sync code - A'rpi\n" \
-                   "       subtitles file parser/reader - Lez( most of them )\n" \
-                   "       config files & commandline parser - Szabi\n" \
-                   "       fastmemcpy - Nick Kurshev\n" \
-                   "       LIRC support - Acki\n" \
-                   "       SUB/OSD renderer - Adam Tla/lka\n" \
-                   "       Gui - Pontscho\n\nlibvo drivers:\n" \
-                   "       vo_aa.c - Folke Ashberg\n" \
-                   "       vo_dga.c - Acki\n" \
-                   "       vo_fbdev.c - Szabi\n" \
-                   "       vo_ggi.c - al3x\n" \
-                   "       vo_gl.c - A'rpi\n" \
-                   "       vo_md5.c - A'rpi\n" \
-                   "       vo_mga.c - A'rpi\n" \
-                   "       vo_null.c - A'rpi\n" \
-                   "       vo_odivx.c - A'rpi\n" \
-                   "       vo_pgm.c - A'rpi\n" \
-                   "       vo_png.c - Atmos\n" \
-                   "       vo_sdl.c - Atmos\n" \
-                   "       vo_svga.c - se7en\n" \
-                   "       vo_x11.c - Pontscho\n"\
-                   "       vo_xmga.c - Pontscho\n"\
-                   "       vo_xv.c - Pontscho\n" \
-                   "       vo_aa.c - Folke Ashberg\n\n" \
-                   "libao2 drivers:\n" \
-                   "       ao_alsa5.c - al3x\n" \
-                   "       ao_alsa9.c - al3x( BUGGY,use oss )\n" \
-                   "       ao_null.c - A'rpi\n" \
-                   "       ao_oss.c - A'rpi\n" \
-                   "       ao_pcm.c - Atmos\n" \
-                   "       ao_sdl.c - Atmos\n" \
-                   "       ao_sun.c - Jürgen Keil\n\n" \
-                   "Homepage:\n" \
-                   "        Design:  Chass\n" \
-                   "        Contents: Gabucino\n" \
-                   "                  LGB\n\n" \
-                   "English documentation:\n" \
-                   "        tech-*.txt: A'rpi\n" \
-                   "        all the others: Gabucino\n\n" \
-                   "Documentation translations:\n" \
-                   "       Hungarian - Gabucino\n" \
-                   "       Spanish - TeLeNiEkO\n" \
-                   "       Russian - Nick Kurshev\n" \
-                   "       Polish - Dariush Pietrzak\n" \
-                   "       German - Atmosfear\n\n" \
-                   "Platforms/ports:\n" \
-                   "       DEBIAN packaging - Dariush Pietrzak\n" \
-                   "       FreeBSD support - Vladimir Kushnir\n" \
-                   "       Solaris 8 support - Jürgen Keil\n",1535 );
-
-  hseparator1=gtk_hseparator_new( );
+	"\n" \
+	"   MPlayer core team:\n" \
+	"\n" \
+	"     * Arpad Gereoffy (A'rpi/ESP-team)\n" \
+	"     * Zoltan Ponekker (Pontscho/Fresh!mindworkz)\n" \
+	"     * Gabor Berczi (Gabucino)\n" \
+	"     * Alex Beregszaszi (al3x)\n" \
+	"     * Gabor Lenart (LGB)\n" \
+	"     * Felix Bunemann (Atmos)\n" \
+	"     * Alban Bedel (Albeu)\n" \
+	"     * pl\n" \
+	"     * Michael Niedermayer\n" \
+	"\n" \
+	"   Additional codes:\n" \
+	"\n" \
+	"     * Szabolcs Berecz (Szabi)\n" \
+	"     * Laszlo Megyer (Lez, Laaz)\n" \
+	"     * Gyula Laszlo (Chass, Tegla)\n" \
+	"     * Zoltan Mark Vician (Se7en)\n" \
+	"     * Andreas Ackermann (Acki)\n" \
+	"     * TeLeNiEkO\n" \
+	"     * Michael Graffam\n" \
+	"     * Jens Hoffmann\n" \
+	"     * German Gomez Garcia\n" \
+	"     * Dariusz Pietrzak (Eyck)\n" \
+	"     * Marcus Comstedt\n" \
+	"     * Jurgen Keil\n" \
+	"     * Vladimir Kushnir\n" \
+	"     * Bertrand BAUDET\n" \
+	"     * Derek J Witt\n" \
+	"     * Artur Zaprzala\n" \
+	"     * lanzz@lanzz.org\n" \
+	"     * Adam Tla/lka\n" \
+	"     * Folke Ashberg\n" \
+	"     * Kamil Toman\n" \
+	"     * Ivan Kalvatchev\n" \
+	"     * Sven Goethel\n" \
+	"     * joy_ping\n" \
+	"     * Eric Anholt\n" \
+	"     * Jiri Svoboda\n" \
+	"     * Oliver Schoenbrunner\n" \
+	"     * Jeroen Dobbelaere\n" \
+	"     * David Holm\n" \
+	"     * Panagiotis Issaris\n" \
+	"     * Mike Melanson\n" \
+	"     * Tobias Diedrich\n" \
+	"     * Kilian A. Foth\n" \
+	"     * Tim Ferguson\n" \
+	"     * Sam Lin\n" \
+	"     * Johannes Feigl\n" \
+	"     * Kim Minh Kaplan\n" \
+	"     * Brian Kuschak\n" \
+	"     * Stephen Davies\n" \
+	"     * Rik Snel\n" \
+	"     * Anders Johansson\n" \
+	"     * Roberto Togni\n" \
+	"     * Wojtek Kaniewski\n" \
+	"     * Fredrik Kuivinen\n" \
+	"\n" \
+	"   Main testers:\n" \
+	"\n" \
+	"     * Tibor Balazs (Tibcu)\n" \
+	"     * Peter Sasi (SaPe)\n" \
+	"     * Christoph H. Lampert\n" \
+	"     * Attila Kinali\n" \
+	"     * Dirk Vornheder\n" \
+	"     * Bohdan Horst (Nexus)\n" \
+	"\n",1481 );
+
+  hseparator1=gtk_hseparator_new();
   gtk_widget_set_name( hseparator1,"hseparator1" );
   gtk_widget_ref( hseparator1 );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"hseparator1",hseparator1,
-                           ( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"hseparator1",hseparator1,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( hseparator1 );
   gtk_box_pack_start( GTK_BOX( vbox1 ),hseparator1,FALSE,FALSE,0 );
   gtk_widget_set_usize( hseparator1,-2,10 );
@@ -181,8 +211,7 @@ GtkWidget * create_About( void )
   hbuttonbox1=gtk_hbutton_box_new( );
   gtk_widget_set_name( hbuttonbox1,"hbuttonbox1" );
   gtk_widget_ref( hbuttonbox1 );
-  gtk_object_set_data_full( GTK_OBJECT( About ),"hbuttonbox1",hbuttonbox1,
-                           ( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),"hbuttonbox1",hbuttonbox1,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_set_usize( hbuttonbox1,-2,25 );
   gtk_button_box_set_child_size( GTK_BUTTON_BOX( hbuttonbox1 ),75,0 );
   gtk_widget_show( hbuttonbox1 );
@@ -191,12 +220,14 @@ GtkWidget * create_About( void )
   Ok=gtk_button_new_with_label( MSGTR_Ok );
   gtk_widget_set_name( Ok,MSGTR_Ok );
   gtk_widget_ref( Ok );
-  gtk_object_set_data_full( GTK_OBJECT( About ),MSGTR_Ok,Ok,( GtkDestroyNotify ) gtk_widget_unref );
+  gtk_object_set_data_full( GTK_OBJECT( About ),MSGTR_Ok,Ok,(GtkDestroyNotify)gtk_widget_unref );
   gtk_widget_show( Ok );
   gtk_container_add( GTK_CONTAINER( hbuttonbox1 ),Ok );
 
-  gtk_signal_connect( GTK_OBJECT( About ),"destroy",GTK_SIGNAL_FUNC( ab_Ok_released ),NULL );
-  gtk_signal_connect( GTK_OBJECT( Ok ),"released",GTK_SIGNAL_FUNC( ab_Ok_released ),NULL );
+  gtk_signal_connect( GTK_OBJECT( About ),"destroy",GTK_SIGNAL_FUNC( ab_Ok_released ),0 );
+  gtk_signal_connect( GTK_OBJECT( About ),"show",GTK_SIGNAL_FUNC( ab_AboutBox_show ),1 );
+  gtk_signal_connect( GTK_OBJECT( About ),"hide",GTK_SIGNAL_FUNC( ab_AboutBox_show ),0 );
+  gtk_signal_connect( GTK_OBJECT( Ok ),"released",GTK_SIGNAL_FUNC( ab_Ok_released ),0 );
 
   gtk_widget_add_accelerator( Ok,"released",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
   gtk_widget_add_accelerator( Ok,"released",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );