[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk opts.c,1.39,1.40

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/Gui/mplayer/gtk
In directory mail:/var/tmp.root/cvs-serv28640/Gui/mplayer/gtk

Modified Files:
	opts.c 
Log Message:
add overlapping to preferences

Index: opts.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/opts.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- opts.c	2 Jan 2003 12:42:31 -0000	1.39
+++ opts.c	2 Jan 2003 14:41:39 -0000	1.40
@@ -60,6 +60,7 @@
 static GtkWidget * CBFlip;
 static GtkWidget * CBNoAutoSub;
 static GtkWidget * CBSubUnicode;
+static GtkWidget * CBSubOverlap;
 static GtkWidget * CBDumpMPSub;
 static GtkWidget * CBDumpSrt;
 static GtkWidget * CBPostprocess;
@@ -245,6 +246,7 @@
  }
 
 // -- 3. page
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBSubOverlap ),suboverlap_enabled );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ),!sub_auto );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ),gtkSubDumpMPSub );
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBDumpSrt ),gtkSubDumpSrt );
@@ -340,6 +342,7 @@
 #ifndef USE_SUB
  gtk_widget_set_sensitive( AConfig,FALSE );
  gtk_widget_set_sensitive( CBNoAutoSub,FALSE );
+ gtk_widget_set_sensitive( CBSubOverlap,FALSE );
  gtk_widget_set_sensitive( CBSubUnicode,FALSE );
  gtk_widget_set_sensitive( CBDumpMPSub,FALSE );
  gtk_widget_set_sensitive( CBDumpSrt,FALSE );
@@ -463,6 +466,7 @@
 	if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBFlip ) ) ) flip=1;
 	
 	// -- 3. page
+	suboverlap_enabled=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBSubOverlap ) );
 	sub_auto=!gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBNoAutoSub ) );
 	gtkSubDumpMPSub=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpMPSub ) );
 	gtkSubDumpSrt=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBDumpSrt ) );
@@ -872,6 +876,7 @@
 
   vbox9=AddVBox( vbox8,0 );
 
+  CBSubOverlap=AddCheckButton( MSGTR_PREFERENCES_SUB_Overlap,vbox9 );
   CBNoAutoSub=AddCheckButton( MSGTR_PREFERENCES_SUB_AutoLoad,vbox9 );
   CBSubUnicode=AddCheckButton( MSGTR_PREFERENCES_SUB_Unicode,vbox9 );
   CBDumpMPSub=AddCheckButton( MSGTR_PREFERENCES_SUB_MPSUB,vbox9 );