March 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r36118 - in trunk/gui/dialog: dialog.c dialog.h skinbrowser.c tools.c tools.h
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 20:30:30 2013 New Revision: 36118 Log: Move gtkFindCList() to tools.c. Additionally, rename it gtkFindInCList(). Modified: trunk/gui/dialog/dialog.c trunk/gui/dialog/dialog.h trunk/gui/dialog/skinbrowser.c trunk/gui/dialog/tools.c trunk/gui/dialog/tools.h Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Sun Mar 31 20:08:37 2013 (r36117) +++ trunk/gui/dialog/dialog.c Sun Mar 31 20:30:30 2013 (r36118) @@ -66,6 +66,7 @@ static int gtkInitialized; #include "menu.h" #include "url.h" #include "equalizer.h" +#include "tools.h" static const char gui_icon_name[] = "mplayer"; @@ -188,21 +189,6 @@ void gtkAddIcon(GtkWidget *window) wsWindowIcon(gdk_display, GDK_WINDOW_XWINDOW(window->window), &guiIcon); } -int gtkFindCList(GtkWidget *list, char *item) -{ - gint j; - gchar *tmpstr; - - for (j = 0; j < GTK_CLIST(list)->rows; j++) { - gtk_clist_get_text(GTK_CLIST(list), j, 0, &tmpstr); - - if (!strcmp(tmpstr, item)) - return j; - } - - return -1; -} - void gtkEventHandling(void) { int i; @@ -281,7 +267,7 @@ static void gtkSelectInCList(GtkWidget * { gint i; - if ((i = gtkFindCList(list, item)) > -1) + if ((i = gtkFindInCList(list, item)) > -1) gtk_clist_select_row(GTK_CLIST(list), i, 0); } Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Sun Mar 31 20:08:37 2013 (r36117) +++ trunk/gui/dialog/dialog.h Sun Mar 31 20:30:30 2013 (r36118) @@ -67,7 +67,6 @@ void gtkInit(char *display_name); void gtkAddIcon(GtkWidget *window); int gtkFillSkinList(gchar *dir); -int gtkFindCList(GtkWidget *list, char *item); void gtkEventHandling(void); Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Sun Mar 31 20:08:37 2013 (r36117) +++ trunk/gui/dialog/skinbrowser.c Sun Mar 31 20:30:30 2013 (r36118) @@ -183,7 +183,7 @@ int gtkFillSkinList( gchar * mdir ) str[0]="default"; str[1]=""; - if ( gtkFindCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str ); + if ( gtkFindInCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str ); glob( mdir,GLOB_NOSORT,NULL,&gg ); for( i=0;i<(int)gg.gl_pathc;i++ ) @@ -196,7 +196,7 @@ int gtkFillSkinList( gchar * mdir ) else tmp = gg.gl_pathv[i]; if ( !strcmp( tmp,"default" ) ) continue; str[0]=tmp; - if ( gtkFindCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str ); + if ( gtkFindInCList( SkinList,str[0] ) == -1 ) gtk_clist_append( GTK_CLIST( SkinList ),str ); } } globfree( &gg ); Modified: trunk/gui/dialog/tools.c ============================================================================== --- trunk/gui/dialog/tools.c Sun Mar 31 20:08:37 2013 (r36117) +++ trunk/gui/dialog/tools.c Sun Mar 31 20:30:30 2013 (r36118) @@ -18,6 +18,7 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> +#include <string.h> #include "tools.h" @@ -187,3 +188,18 @@ GtkWidget * gtkAddCombo( GtkWidget * par if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),CB,TRUE,TRUE,0 ); return CB; } + +int gtkFindInCList (GtkWidget *list, char *item) +{ + gint j; + gchar *tmpstr; + + for (j = 0; j < GTK_CLIST(list)->rows; j++) + { + gtk_clist_get_text(GTK_CLIST(list), j, 0, &tmpstr); + + if (!strcmp(tmpstr, item)) return j; + } + + return -1; +} Modified: trunk/gui/dialog/tools.h ============================================================================== --- trunk/gui/dialog/tools.h Sun Mar 31 20:08:37 2013 (r36117) +++ trunk/gui/dialog/tools.h Sun Mar 31 20:30:30 2013 (r36118) @@ -36,5 +36,6 @@ GtkWidget * gtkAddHButtonBox( GtkWidget GtkWidget * gtkAddHScale( GtkAdjustment * adj, GtkWidget * parent, int digit ); GtkWidget * gtkAddVScale( GtkAdjustment * adj, GtkWidget * parent, int digit ); GtkWidget * gtkAddCombo( GtkWidget * parent ); +int gtkFindInCList(GtkWidget *list, char *item); #endif /* MPLAYER_GUI_TOOLS_H */

1 0

[propchange]: r36117 - svn:log
by ib 31 Mar '13

31 Mar '13

Author: ib Revision: 36117 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,4 +1,4 @@ -Cosmetic: Prefix all functions in dialog/tool.c with gtk. +Cosmetic: Prefix all functions in dialog/tools.c with gtk. Additionally, rename AddHScaler() AddHScale(), AddVScaler() AddVScale() and AddComboBox() AddCombo() first.

1 0

r36117 - in trunk/gui/dialog: about.c equalizer.c fileselect.c msgbox.c playlist.c preferences.c skinbrowser.c tools.c tools.h url.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 20:08:37 2013 New Revision: 36117 Log: Cosmetic: Prefix all functions in dialog/tool.c with gtk. Additionally, rename AddHScaler() AddHScale(), AddVScaler() AddVScale() and AddComboBox() AddCombo() first. Modified: trunk/gui/dialog/about.c trunk/gui/dialog/equalizer.c trunk/gui/dialog/fileselect.c trunk/gui/dialog/msgbox.c trunk/gui/dialog/playlist.c trunk/gui/dialog/preferences.c trunk/gui/dialog/skinbrowser.c trunk/gui/dialog/tools.c trunk/gui/dialog/tools.h trunk/gui/dialog/url.c Modified: trunk/gui/dialog/about.c ============================================================================== --- trunk/gui/dialog/about.c Sun Mar 31 19:41:18 2013 (r36116) +++ trunk/gui/dialog/about.c Sun Mar 31 20:08:37 2013 (r36117) @@ -71,7 +71,7 @@ static GtkWidget * CreateAbout( void ) gtk_widget_realize( About ); gtkAddIcon( About ); - vbox=AddVBox( AddDialogFrame( About ),0 ); + vbox=gtkAddVBox( gtkAddDialogFrame( About ),0 ); pixmapstyle=gtk_widget_get_style( About ); pixmapwid=gdk_pixmap_colormap_create_from_xpm_d( About->window,gdk_colormap_get_system(),&mask,&pixmapstyle->bg[GTK_STATE_NORMAL],(gchar **) emblem_xpm ); @@ -82,7 +82,7 @@ static GtkWidget * CreateAbout( void ) gtk_box_pack_start( GTK_BOX( vbox ),pixmap1,FALSE,FALSE,0 ); gtk_widget_set_usize( pixmap1,-2,174 ); - AddHSeparator( vbox ); + gtkAddHSeparator( vbox ); scrolledwindow1=gtk_scrolled_window_new( NULL,NULL ); gtk_widget_set_name( scrolledwindow1,"scrolledwindow1" ); @@ -337,8 +337,8 @@ static GtkWidget * CreateAbout( void ) " * Franciszek Wilamowski\n" " * Michael Zeising", -1 ); - AddHSeparator( vbox ); - Ok=AddButton( MSGTR_Ok,AddHButtonBox( vbox ) ); + gtkAddHSeparator( vbox ); + Ok=gtkAddButton( MSGTR_Ok,gtkAddHButtonBox( vbox ) ); gtk_signal_connect( GTK_OBJECT( About ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&About ); gtk_signal_connect_object( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( abWidgetDestroy ),NULL ); Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Sun Mar 31 19:41:18 2013 (r36116) +++ trunk/gui/dialog/equalizer.c Sun Mar 31 20:08:37 2013 (r36117) @@ -269,7 +269,7 @@ static GtkWidget * CreateEqualizer( void gtk_widget_realize( Equalizer ); gtkAddIcon( Equalizer ); - vbox1=AddVBox( AddDialogFrame( Equalizer ),0 ); + vbox1=gtkAddVBox( gtkAddDialogFrame( Equalizer ),0 ); Notebook=gtk_notebook_new(); gtk_widget_set_name( Notebook,"Notebook" ); @@ -277,7 +277,7 @@ static GtkWidget * CreateEqualizer( void gtk_box_pack_start( GTK_BOX( vbox1 ),Notebook,TRUE,TRUE,0 ); gtk_container_set_border_width( GTK_CONTAINER( Notebook ),1 ); - hbox1=AddHBox( Notebook,0 ); + hbox1=gtkAddHBox( Notebook,0 ); scrolledwindow1=gtk_scrolled_window_new( NULL,NULL ); gtk_widget_set_name( scrolledwindow1,"scrolledwindow1" ); @@ -301,87 +301,87 @@ static GtkWidget * CreateEqualizer( void gtk_table_set_col_spacings( GTK_TABLE( table1 ),9 ); A3125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); - A3125=AddVScaler( A3125adj,NULL,-1 ); + A3125=gtkAddVScale( A3125adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A3125,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); A6250adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); - A6250=AddVScaler( A6250adj,NULL,-1 ); + A6250=gtkAddVScale( A6250adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A6250,1,2,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); A125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); - A125=AddVScaler( A125adj,NULL,-1 ); + A125=gtkAddVScale( A125adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A125,2,3,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); A250adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); - A250=AddVScaler( A250adj,NULL,-1 ); + A250=gtkAddVScale( A250adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A250,3,4,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); A500adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); - A500=AddVScaler( A500adj,NULL,-1 ); + A500=gtkAddVScale( A500adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A500,4,5,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); A1000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); - A1000=AddVScaler( A1000adj,NULL,-1 ); + A1000=gtkAddVScale( A1000adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A1000,5,6,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); A2000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); - A2000=AddVScaler( A2000adj,NULL,-1 ); + A2000=gtkAddVScale( A2000adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A2000,6,7,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); A4000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); - A4000=AddVScaler( A4000adj,NULL,-1 ); + A4000=gtkAddVScale( A4000adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A4000,7,8,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); A8000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); - A8000=AddVScaler( A8000adj,NULL,-1 ); + A8000=gtkAddVScale( A8000adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A8000,8,9,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); A16000adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) ); - A16000=AddVScaler( A16000adj,NULL,-1 ); + A16000=gtkAddVScale( A16000adj,NULL,-1 ); gtk_table_attach( GTK_TABLE( table1 ),A16000,9,10,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( "31.25",NULL ), + gtkAddLabel( "31.25",NULL ), 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( "62.50",NULL ), + gtkAddLabel( "62.50",NULL ), 1,2,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( "125",NULL ), + gtkAddLabel( "125",NULL ), 2,3,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( "250",NULL ), + gtkAddLabel( "250",NULL ), 3,4,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( "500",NULL ), + gtkAddLabel( "500",NULL ), 4,5,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( "1000",NULL ), + gtkAddLabel( "1000",NULL ), 5,6,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( "2000",NULL ), + gtkAddLabel( "2000",NULL ), 6,7,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( "4000",NULL ), + gtkAddLabel( "4000",NULL ), 7,8,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( "8000",NULL ), + gtkAddLabel( "8000",NULL ), 8,9,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( "16000",NULL ), + gtkAddLabel( "16000",NULL ), 9,10,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),0 ), - AddLabel( MSGTR_EQU_Audio,NULL ) ); + gtkAddLabel( MSGTR_EQU_Audio,NULL ) ); table1=gtk_table_new( 4,2,FALSE ); gtk_widget_set_name( table1,"table1" ); @@ -389,53 +389,53 @@ static GtkWidget * CreateEqualizer( void gtk_container_add( GTK_CONTAINER( Notebook ),table1 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( MSGTR_EQU_Contrast,NULL ), + gtkAddLabel( MSGTR_EQU_Contrast,NULL ), 0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( MSGTR_EQU_Brightness,NULL ), + gtkAddLabel( MSGTR_EQU_Brightness,NULL ), 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( MSGTR_EQU_Hue,NULL ), + gtkAddLabel( MSGTR_EQU_Hue,NULL ), 0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( MSGTR_EQU_Saturation,NULL ), + gtkAddLabel( MSGTR_EQU_Saturation,NULL ), 0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); VContrastadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); - VContrast=AddHScaler( VContrastadj,NULL,1 ); + VContrast=gtkAddHScale( VContrastadj,NULL,1 ); gtk_table_attach( GTK_TABLE( table1 ),VContrast,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_widget_set_usize( VContrast,-1,45 ); VBrightnessadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); - VBrightness=AddHScaler( VBrightnessadj,NULL,1 ); + VBrightness=gtkAddHScale( VBrightnessadj,NULL,1 ); gtk_table_attach( GTK_TABLE( table1 ),VBrightness,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_widget_set_usize( VBrightness,-1,45 ); VHueadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); - VHue=AddHScaler( VHueadj,NULL,1 ); + VHue=gtkAddHScale( VHueadj,NULL,1 ); gtk_table_attach( GTK_TABLE( table1 ),VHue,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_widget_set_usize( VHue,-1,45 ); VSaturationadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) ); - VSaturation=AddHScaler( VSaturationadj,NULL,1 ); + VSaturation=gtkAddHScale( VSaturationadj,NULL,1 ); gtk_table_attach( GTK_TABLE( table1 ),VSaturation,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_widget_set_usize( VSaturation,-1,45 ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),1 ), - AddLabel( MSGTR_EQU_Video,NULL ) ); + gtkAddLabel( MSGTR_EQU_Video,NULL ) ); - AddHSeparator( vbox1 ); + gtkAddHSeparator( vbox1 ); - hbuttonbox1=AddHButtonBox( vbox1 ); + hbuttonbox1=gtkAddHButtonBox( vbox1 ); gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END ); gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 ); - Config=AddButton( MSGTR_Config,hbuttonbox1 ); - Clear=AddButton( MSGTR_Clear,hbuttonbox1 ); - Ok=AddButton( MSGTR_Ok,hbuttonbox1 ); + Config=gtkAddButton( MSGTR_Config,hbuttonbox1 ); + Clear=gtkAddButton( MSGTR_Clear,hbuttonbox1 ); + Ok=gtkAddButton( MSGTR_Ok,hbuttonbox1 ); gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); @@ -607,7 +607,7 @@ GtkWidget * CreateEquConfig( void ) gtk_widget_realize( EquConfig ); gtkAddIcon( EquConfig ); - vbox1=AddVBox( AddDialogFrame( EquConfig ),0 ); + vbox1=gtkAddVBox( gtkAddDialogFrame( EquConfig ),0 ); table1=gtk_table_new( 6,2,FALSE ); gtk_widget_set_name( table1,"table1" ); @@ -617,79 +617,79 @@ GtkWidget * CreateEquConfig( void ) gtk_table_set_col_spacings( GTK_TABLE( table1 ),4 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( MSGTR_EQU_Channel1,NULL ), + gtkAddLabel( MSGTR_EQU_Channel1,NULL ), 0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( MSGTR_EQU_Channel2,NULL ), + gtkAddLabel( MSGTR_EQU_Channel2,NULL ), 0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( MSGTR_EQU_Channel3,NULL ), + gtkAddLabel( MSGTR_EQU_Channel3,NULL ), 0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( MSGTR_EQU_Channel4,NULL ), + gtkAddLabel( MSGTR_EQU_Channel4,NULL ), 0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( MSGTR_EQU_Channel5,NULL ), + gtkAddLabel( MSGTR_EQU_Channel5,NULL ), 0,1,4,5,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); gtk_table_attach( GTK_TABLE( table1 ), - AddLabel( MSGTR_EQU_Channel6,NULL ), + gtkAddLabel( MSGTR_EQU_Channel6,NULL ), 0,1,5,6,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - CBChannel1=AddComboBox( NULL ); + CBChannel1=gtkAddCombo( NULL ); gtk_table_attach( GTK_TABLE( table1 ),CBChannel1,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CEChannel1=GTK_COMBO( CBChannel1 )->entry; gtk_widget_set_name( CEChannel1,"CEChannel1" ); gtk_widget_show( CEChannel1 ); - CBChannel2=AddComboBox( NULL ); + CBChannel2=gtkAddCombo( NULL ); gtk_table_attach( GTK_TABLE( table1 ),CBChannel2,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CEChannel2=GTK_COMBO( CBChannel2 )->entry; gtk_widget_set_name( CEChannel2,"CEChannel2" ); gtk_widget_show( CEChannel2 ); - CBChannel3=AddComboBox( NULL ); + CBChannel3=gtkAddCombo( NULL ); gtk_table_attach( GTK_TABLE( table1 ),CBChannel3,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CEChannel3=GTK_COMBO( CBChannel3 )->entry; gtk_widget_set_name( CEChannel3,"CEChannel3" ); gtk_widget_show( CEChannel3 ); - CBChannel4=AddComboBox( NULL ); + CBChannel4=gtkAddCombo( NULL ); gtk_table_attach( GTK_TABLE( table1 ),CBChannel4,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CEChannel4=GTK_COMBO( CBChannel4 )->entry; gtk_widget_set_name( CEChannel4,"CEChannel4" ); gtk_widget_show( CEChannel4 ); - CBChannel5=AddComboBox( NULL ); + CBChannel5=gtkAddCombo( NULL ); gtk_table_attach( GTK_TABLE( table1 ),CBChannel5,1,2,4,5,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CEChannel5=GTK_COMBO( CBChannel5 )->entry; gtk_widget_set_name( CEChannel5,"CEChannel5" ); gtk_widget_show( CEChannel5 ); - CBChannel6=AddComboBox( NULL ); + CBChannel6=gtkAddCombo( NULL ); gtk_table_attach( GTK_TABLE( table1 ),CBChannel6,1,2,5,6,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CEChannel6=GTK_COMBO( CBChannel6 )->entry; gtk_widget_set_name( CEChannel6,"CEChannel6" ); gtk_widget_show( CEChannel6 ); - AddHSeparator( vbox1 ); + gtkAddHSeparator( vbox1 ); - hbuttonbox1=AddHButtonBox( vbox1 ); + hbuttonbox1=gtkAddHButtonBox( vbox1 ); gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END ); gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 ); - ecOk=AddButton( MSGTR_Ok,hbuttonbox1 ); - ecCancel=AddButton( MSGTR_Cancel,hbuttonbox1 ); + ecOk=gtkAddButton( MSGTR_Ok,hbuttonbox1 ); + ecCancel=gtkAddButton( MSGTR_Cancel,hbuttonbox1 ); gtk_widget_add_accelerator( ecOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Sun Mar 31 19:41:18 2013 (r36116) +++ trunk/gui/dialog/fileselect.c Sun Mar 31 20:08:37 2013 (r36117) @@ -623,8 +623,8 @@ static GtkWidget *CreateFileSelect(void) dpixmap = gdk_pixmap_colormap_create_from_xpm_d(FileSelector->window, fsColorMap, &dmask, &style->bg[GTK_STATE_NORMAL], (gchar **)dir_xpm); fpixmap = gdk_pixmap_colormap_create_from_xpm_d(FileSelector->window, fsColorMap, &fmask, &style->bg[GTK_STATE_NORMAL], (gchar **)file_xpm); - vbox4 = AddVBox(AddDialogFrame(FileSelector), 0); - hbox4 = AddHBox(vbox4, 1); + vbox4 = gtkAddVBox(gtkAddDialogFrame(FileSelector), 0); + hbox4 = gtkAddHBox(vbox4, 1); fsCombo4 = gtk_combo_new(); gtk_widget_set_name(fsCombo4, "fsCombo4"); @@ -654,9 +654,9 @@ static GtkWidget *CreateFileSelect(void) gtk_box_pack_start(GTK_BOX(hbox4), fsUp, FALSE, FALSE, 0); gtk_widget_set_usize(fsUp, 65, 15); - AddHSeparator(vbox4); + gtkAddHSeparator(vbox4); - hbox6 = AddHBox(NULL, 0); + hbox6 = gtkAddHBox(NULL, 0); gtk_box_pack_start(GTK_BOX(vbox4), hbox6, TRUE, TRUE, 0); fsFNameListWindow = gtk_scrolled_window_new(NULL, NULL); @@ -674,7 +674,7 @@ static GtkWidget *CreateFileSelect(void) gtk_clist_column_titles_hide(GTK_CLIST(fsFNameList)); gtk_clist_set_shadow_type(GTK_CLIST(fsFNameList), GTK_SHADOW_ETCHED_OUT); - AddHSeparator(vbox4); + gtkAddHSeparator(vbox4); List = gtk_combo_new(); gtk_widget_set_name(List, "List"); @@ -690,14 +690,14 @@ static GtkWidget *CreateFileSelect(void) gtk_entry_set_editable(GTK_ENTRY(fsFilterCombo), FALSE); gtk_widget_set_usize(fsFilterCombo, -2, 20); - AddHSeparator(vbox4); + gtkAddHSeparator(vbox4); - hbuttonbox3 = AddHButtonBox(vbox4); + hbuttonbox3 = gtkAddHButtonBox(vbox4); gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox3), GTK_BUTTONBOX_END); gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox3), 10); - fsOk = AddButton(MSGTR_Ok, hbuttonbox3); - fsCancel = AddButton(MSGTR_Cancel, hbuttonbox3); + fsOk = gtkAddButton(MSGTR_Ok, hbuttonbox3); + fsCancel = gtkAddButton(MSGTR_Cancel, hbuttonbox3); gtk_signal_connect(GTK_OBJECT(FileSelector), "destroy", GTK_SIGNAL_FUNC(fs_Destroy), NULL); gtk_signal_connect(GTK_OBJECT(FileSelector), "key_release_event", GTK_SIGNAL_FUNC(on_FileSelect_key_release_event), NULL); Modified: trunk/gui/dialog/msgbox.c ============================================================================== --- trunk/gui/dialog/msgbox.c Sun Mar 31 19:41:18 2013 (r36116) +++ trunk/gui/dialog/msgbox.c Sun Mar 31 20:08:37 2013 (r36117) @@ -65,8 +65,8 @@ static GtkWidget * CreateMessageBox( voi gtk_widget_realize( MessageBox ); gtkAddIcon( MessageBox ); - vbox1=AddVBox( AddDialogFrame( MessageBox ),0 ); - hbox1=AddHBox( vbox1,1 ); + vbox1=gtkAddVBox( gtkAddDialogFrame( MessageBox ),0 ); + hbox1=gtkAddHBox( vbox1,1 ); pixmapstyle=gtk_widget_get_style( MessageBox ); @@ -93,9 +93,9 @@ static GtkWidget * CreateMessageBox( voi gtk_label_set_justify( GTK_LABEL( gtkMessageBoxText ),GTK_JUSTIFY_CENTER ); gtk_label_set_line_wrap( GTK_LABEL( gtkMessageBoxText ),FALSE ); - AddHSeparator( vbox1 ); - hbuttonbox1=AddHButtonBox( vbox1 ); - Ok=AddButton( MSGTR_Ok,hbuttonbox1 ); + gtkAddHSeparator( vbox1 ); + hbuttonbox1=gtkAddHButtonBox( vbox1 ); + Ok=gtkAddButton( MSGTR_Ok,hbuttonbox1 ); gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Sun Mar 31 19:41:18 2013 (r36116) +++ trunk/gui/dialog/playlist.c Sun Mar 31 20:08:37 2013 (r36117) @@ -454,14 +454,14 @@ static GtkWidget * CreatePlaylist( void gtk_widget_realize( Playlist ); gtkAddIcon( Playlist ); - vbox1=AddVBox( AddDialogFrame( Playlist ),0 ); - hbox1=AddHBox( NULL,1 ); + vbox1=gtkAddVBox( gtkAddDialogFrame( Playlist ),0 ); + hbox1=gtkAddHBox( NULL,1 ); gtk_box_pack_start( GTK_BOX( vbox1 ),hbox1,TRUE,TRUE,0 ); scrolledwindow1=gtk_scrolled_window_new( NULL,NULL ); gtk_widget_show( scrolledwindow1 ); gtk_container_add( GTK_CONTAINER( - AddFrame( NULL,0,hbox1,1 ) ),scrolledwindow1 ); + gtkAddFrame( NULL,0,hbox1,1 ) ),scrolledwindow1 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC ); CTDirTree=gtk_ctree_new( 1,0 ); @@ -492,12 +492,12 @@ static GtkWidget * CreatePlaylist( void else if ( fsHistory[0] ) old_path = strdup( cfg_old_filename_from_utf8( fsHistory[0] ) ); gtk_clist_set_column_widget( GTK_CLIST( CTDirTree ),0, - AddLabel( MSGTR_PLAYLIST_DirectoryTree,NULL ) ); + gtkAddLabel( MSGTR_PLAYLIST_DirectoryTree,NULL ) ); gtk_clist_column_title_passive( GTK_CLIST( CTDirTree ),0 ); - vbox2=AddVBox( - AddFrame( NULL,1,hbox1,1 ),0 ); + vbox2=gtkAddVBox( + gtkAddFrame( NULL,1,hbox1,1 ),0 ); scrolledwindow2=gtk_scrolled_window_new( NULL,NULL ); gtk_widget_show( scrolledwindow2 ); @@ -514,11 +514,11 @@ static GtkWidget * CreatePlaylist( void gtk_clist_set_shadow_type( GTK_CLIST( CLFiles ),GTK_SHADOW_NONE ); gtk_clist_set_column_widget( GTK_CLIST( CLFiles ),0, - AddLabel( MSGTR_PLAYLIST_Files,NULL ) ); + gtkAddLabel( MSGTR_PLAYLIST_Files,NULL ) ); gtk_clist_column_title_passive( GTK_CLIST( CLFiles ),0 ); - AddHSeparator( vbox2 ); + gtkAddHSeparator( vbox2 ); scrolledwindow3=gtk_scrolled_window_new( NULL,NULL ); gtk_widget_show( scrolledwindow3 ); @@ -537,23 +537,23 @@ static GtkWidget * CreatePlaylist( void gtk_clist_set_shadow_type( GTK_CLIST( CLSelected ),GTK_SHADOW_NONE ); gtk_clist_set_column_widget( GTK_CLIST( CLSelected ),0, - AddLabel( MSGTR_PLAYLIST_Selected,NULL ) ); + gtkAddLabel( MSGTR_PLAYLIST_Selected,NULL ) ); gtk_clist_set_column_widget( GTK_CLIST( CLSelected ),1, - AddLabel( MSGTR_PLAYLIST_Path,NULL ) ); + gtkAddLabel( MSGTR_PLAYLIST_Path,NULL ) ); gtk_clist_column_title_passive( GTK_CLIST( CLSelected ),0 ); - AddHSeparator( vbox1 ); + gtkAddHSeparator( vbox1 ); - hbuttonbox1=AddHButtonBox( vbox1 ); + hbuttonbox1=gtkAddHButtonBox( vbox1 ); gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END ); gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 ); - Add=AddButton( MSGTR_Add,hbuttonbox1 ); - Remove=AddButton( MSGTR_Remove,hbuttonbox1 ); - Ok=AddButton( MSGTR_Ok,hbuttonbox1 ); - Cancel=AddButton( MSGTR_Cancel,hbuttonbox1 ); + Add=gtkAddButton( MSGTR_Add,hbuttonbox1 ); + Remove=gtkAddButton( MSGTR_Remove,hbuttonbox1 ); + Ok=gtkAddButton( MSGTR_Ok,hbuttonbox1 ); + Cancel=gtkAddButton( MSGTR_Cancel,hbuttonbox1 ); gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Sun Mar 31 19:41:18 2013 (r36116) +++ trunk/gui/dialog/preferences.c Sun Mar 31 20:08:37 2013 (r36117) @@ -574,20 +574,20 @@ static GtkWidget * CreatePreferences( vo gtk_widget_realize( Preferences ); gtkAddIcon( Preferences ); - vbox1=AddVBox( AddDialogFrame( Preferences ),0 ); + vbox1=gtkAddVBox( gtkAddDialogFrame( Preferences ),0 ); notebook1=gtk_notebook_new(); gtk_widget_set_name( notebook1,"notebook1" ); gtk_widget_show( notebook1 ); gtk_box_pack_start( GTK_BOX( vbox1 ),notebook1,TRUE,TRUE,0 ); - hbox1=AddVBox( notebook1,0 ); + hbox1=gtkAddVBox( notebook1,0 ); - frame=AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,1 ); - frame=AddFrame( NULL,GTK_SHADOW_NONE,frame,1 ); + frame=gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,1 ); + frame=gtkAddFrame( NULL,GTK_SHADOW_NONE,frame,1 ); /* 1st page */ - vbox2=AddVBox( frame,0 ); + vbox2=gtkAddVBox( frame,0 ); scrolledwindow3=gtk_scrolled_window_new( NULL,NULL ); gtk_widget_set_name( scrolledwindow3,"scrolledwindow3" ); @@ -604,47 +604,47 @@ static GtkWidget * CreatePreferences( vo gtk_clist_set_shadow_type( GTK_CLIST( CLADrivers ),GTK_SHADOW_NONE ); gtk_widget_set_usize( CLADrivers,250,-2 ); gtk_clist_set_column_widget( GTK_CLIST( CLADrivers ),0, - AddLabel( MSGTR_PREFERENCES_AvailableDrivers,NULL ) ); + gtkAddLabel( MSGTR_PREFERENCES_AvailableDrivers,NULL ) ); - AConfig=AddButton( MSGTR_ConfigDriver, - AddHButtonBox( vbox2 ) ); + AConfig=gtkAddButton( MSGTR_ConfigDriver, + gtkAddHButtonBox( vbox2 ) ); - vbox3=AddVBox( - AddFrame( NULL,GTK_SHADOW_NONE, - AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,0 ),1 ),0 ); + vbox3=gtkAddVBox( + gtkAddFrame( NULL,GTK_SHADOW_NONE, + gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,0 ),1 ),0 ); gtk_widget_set_usize( vbox3,250,-2 ); - CBNormalize=AddCheckButton( MSGTR_PREFERENCES_NormalizeSound,vbox3 ); - CBAudioEqualizer=AddCheckButton( MSGTR_PREFERENCES_EnableEqualizer,vbox3 ); - CBSoftwareMixer=AddCheckButton( MSGTR_PREFERENCES_SoftwareMixer,vbox3 ); + CBNormalize=gtkAddCheckButton( MSGTR_PREFERENCES_NormalizeSound,vbox3 ); + CBAudioEqualizer=gtkAddCheckButton( MSGTR_PREFERENCES_EnableEqualizer,vbox3 ); + CBSoftwareMixer=gtkAddCheckButton( MSGTR_PREFERENCES_SoftwareMixer,vbox3 ); #if 0 - CBSurround=AddCheckButton( "Enable surround",vbox3 ); + CBSurround=gtkAddCheckButton( "Enable surround",vbox3 ); #endif - AddHSeparator( vbox3 ); - CBExtraStereo=AddCheckButton( MSGTR_PREFERENCES_ExtraStereo,vbox3 ); - hbox8=AddHBox( vbox3,1 ); - /*label=*/AddLabel( MSGTR_PREFERENCES_Coefficient,hbox8 ); + gtkAddHSeparator( vbox3 ); + CBExtraStereo=gtkAddCheckButton( MSGTR_PREFERENCES_ExtraStereo,vbox3 ); + hbox8=gtkAddHBox( vbox3,1 ); + /*label=*/gtkAddLabel( MSGTR_PREFERENCES_Coefficient,hbox8 ); // gtk_misc_set_padding( GTK_MISC( label ),20,0 ); HSExtraStereoMuladj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10,10,0.1,0,0 ) ); - HSExtraStereoMul=AddHScaler( HSExtraStereoMuladj,hbox8,1 ); - AddHSeparator( vbox3 ); + HSExtraStereoMul=gtkAddHScale( HSExtraStereoMuladj,hbox8,1 ); + gtkAddHSeparator( vbox3 ); - hbox8=AddHBox( vbox3,1 ); - AddLabel( MSGTR_PREFERENCES_AudioDelay,hbox8 ); + hbox8=gtkAddHBox( vbox3,1 ); + gtkAddLabel( MSGTR_PREFERENCES_AudioDelay,hbox8 ); HSAudioDelayadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10,10,0.01,0,0 ) ); - HSAudioDelay=AddHScaler( HSAudioDelayadj,hbox8,2 ); - label=AddLabel( MSGTR_PREFERENCES_Audio,NULL ); + HSAudioDelay=gtkAddHScale( HSAudioDelayadj,hbox8,2 ); + label=gtkAddLabel( MSGTR_PREFERENCES_Audio,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),0 ),label ); /* 2nd page */ - hbox2=AddVBox( notebook1,0 ); + hbox2=gtkAddVBox( notebook1,0 ); - vbox4=AddVBox( - AddFrame( NULL,GTK_SHADOW_NONE, - AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox2,1 ),1 ),0 ); + vbox4=gtkAddVBox( + gtkAddFrame( NULL,GTK_SHADOW_NONE, + gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox2,1 ),1 ),0 ); scrolledwindow2=gtk_scrolled_window_new( NULL,NULL ); gtk_widget_set_name( scrolledwindow2,"scrolledwindow2" ); @@ -661,36 +661,36 @@ static GtkWidget * CreatePreferences( vo gtk_clist_set_shadow_type( GTK_CLIST( CLVDrivers ),GTK_SHADOW_NONE ); gtk_widget_set_usize( CLVDrivers,250,-2 ); - label=AddLabel( MSGTR_PREFERENCES_AvailableDrivers,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_AvailableDrivers,NULL ); gtk_clist_set_column_widget( GTK_CLIST( CLVDrivers ),0,label ); - hbuttonbox3=AddHButtonBox( vbox4 ); - VConfig=AddButton( MSGTR_ConfigDriver,hbuttonbox3 ); + hbuttonbox3=gtkAddHButtonBox( vbox4 ); + VConfig=gtkAddButton( MSGTR_ConfigDriver,hbuttonbox3 ); - vbox5=AddVBox( - AddFrame( NULL,GTK_SHADOW_NONE, - AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox2,0 ),1 ),0 ); + vbox5=gtkAddVBox( + gtkAddFrame( NULL,GTK_SHADOW_NONE, + gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox2,0 ),1 ),0 ); gtk_widget_set_usize( vbox5,250,-2 ); - CBDoubleBuffer=AddCheckButton( MSGTR_PREFERENCES_DoubleBuffer,vbox5 ); - CBDR=AddCheckButton( MSGTR_PREFERENCES_DirectRender,vbox5 ); - CBFramedrop=AddCheckButton( MSGTR_PREFERENCES_FrameDrop,vbox5 ); - CBHFramedrop=AddCheckButton( MSGTR_PREFERENCES_HFrameDrop,vbox5 ); - CBFlip=AddCheckButton( MSGTR_PREFERENCES_Flip,vbox5 ); + CBDoubleBuffer=gtkAddCheckButton( MSGTR_PREFERENCES_DoubleBuffer,vbox5 ); + CBDR=gtkAddCheckButton( MSGTR_PREFERENCES_DirectRender,vbox5 ); + CBFramedrop=gtkAddCheckButton( MSGTR_PREFERENCES_FrameDrop,vbox5 ); + CBHFramedrop=gtkAddCheckButton( MSGTR_PREFERENCES_HFrameDrop,vbox5 ); + CBFlip=gtkAddCheckButton( MSGTR_PREFERENCES_Flip,vbox5 ); table1=gtk_table_new( 3,2,FALSE ); gtk_widget_set_name( table1,"table1" ); gtk_widget_show( table1 ); gtk_box_pack_start( GTK_BOX( vbox5 ),table1,FALSE,FALSE,0 ); - label=AddLabel( MSGTR_PREFERENCES_Panscan,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_Panscan,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=AddLabel( MSGTR_PREFERENCES_FPS,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FPS,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSPanscanadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,1,0.001,0,0 ) ); - HSPanscan=AddHScaler( HSPanscanadj,NULL,1 ); + HSPanscan=gtkAddHScale( HSPanscanadj,NULL,1 ); gtk_table_attach( GTK_TABLE( table1 ),HSPanscan,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSFPSadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,1000,0.001,0,0 ) ); @@ -700,68 +700,68 @@ static GtkWidget * CreatePreferences( vo gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( HSFPS ),TRUE ); gtk_table_attach( GTK_TABLE( table1 ),HSFPS,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=AddLabel( MSGTR_PREFERENCES_Video,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_Video,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),1 ),label ); /* 3rd page */ - vbox6=AddVBox( notebook1,0 ); + vbox6=gtkAddVBox( notebook1,0 ); - vbox600=AddVBox( - AddFrame( NULL,GTK_SHADOW_NONE, - AddFrame( MSGTR_PREFERENCES_FRAME_OSD_Level,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 ); + vbox600=gtkAddVBox( + gtkAddFrame( NULL,GTK_SHADOW_NONE, + gtkAddFrame( MSGTR_PREFERENCES_FRAME_OSD_Level,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 ); - RBOSDNone=AddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL0,&OSD_group,vbox600 ); - RBOSDIndicator=AddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL1,&OSD_group,vbox600 ); - RBOSDTandP=AddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL2,&OSD_group,vbox600 ); - RBOSDTPTT=AddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL3,&OSD_group,vbox600 ); + RBOSDNone=gtkAddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL0,&OSD_group,vbox600 ); + RBOSDIndicator=gtkAddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL1,&OSD_group,vbox600 ); + RBOSDTandP=gtkAddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL2,&OSD_group,vbox600 ); + RBOSDTPTT=gtkAddRadioButton( MSGTR_PREFERENCES_OSD_LEVEL3,&OSD_group,vbox600 ); - vbox7=AddVBox( - AddFrame( NULL,GTK_SHADOW_NONE, - AddFrame( MSGTR_PREFERENCES_FRAME_Subtitle,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 ); + vbox7=gtkAddVBox( + gtkAddFrame( NULL,GTK_SHADOW_NONE, + gtkAddFrame( MSGTR_PREFERENCES_FRAME_Subtitle,GTK_SHADOW_ETCHED_OUT,vbox6,0 ),1 ),0 ); #if 0 - hbox4=AddHBox( vbox7,1 ); + hbox4=gtkAddHBox( vbox7,1 ); - AddLabel( MSGTR_PREFERENCES_Subtitle,hbox4 ); + gtkAddLabel( MSGTR_PREFERENCES_Subtitle,hbox4 ); ESubtitleName=gtk_entry_new(); gtk_widget_set_name( ESubtitleName,"ESubtitleName" ); gtk_widget_show( ESubtitleName ); gtk_box_pack_start( GTK_BOX( hbox4 ),ESubtitleName,TRUE,TRUE,0 ); - hbuttonbox4=AddHButtonBox( hbuttonbox4 ); + hbuttonbox4=gtkAddHButtonBox( hbuttonbox4 ); gtk_container_set_border_width( GTK_CONTAINER( hbuttonbox4 ),3 ); - BLoadSubtitle=AddButton( MSGTR_Browse,hbuttonbox4 ); + BLoadSubtitle=gtkAddButton( MSGTR_Browse,hbuttonbox4 ); #endif - vbox8=AddVBox( vbox7,0 ); + vbox8=gtkAddVBox( vbox7,0 ); table1=gtk_table_new( 3,2,FALSE ); gtk_widget_set_name( table1,"table1" ); gtk_widget_show( table1 ); gtk_box_pack_start( GTK_BOX( vbox8 ),table1,FALSE,FALSE,0 ); - label=AddLabel( MSGTR_PREFERENCES_SUB_Delay,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_SUB_Delay,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=AddLabel( MSGTR_PREFERENCES_SUB_POS,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_SUB_POS,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=AddLabel( MSGTR_PREFERENCES_SUB_FPS,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_SUB_FPS,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); #ifdef CONFIG_ICONV - label=AddLabel( MSGTR_PREFERENCES_FontEncoding,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontEncoding,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); #endif HSSubDelayadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-10.0,10,0.01,0,0 ) ); - HSSubDelay=AddHScaler( HSSubDelayadj,NULL,1 ); + HSSubDelay=gtkAddHScale( HSSubDelayadj,NULL,1 ); gtk_table_attach( GTK_TABLE( table1 ),HSSubDelay,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSSubPositionadj=GTK_ADJUSTMENT( gtk_adjustment_new( 100,0,100,1,0,0 ) ); - HSSubPosition=AddHScaler( HSSubPositionadj,NULL,0 ); + HSSubPosition=gtkAddHScale( HSSubPositionadj,NULL,0 ); gtk_table_attach( GTK_TABLE( table1 ),HSSubPosition,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSSubFPSadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.01,0,0 ) ); @@ -791,71 +791,71 @@ static GtkWidget * CreatePreferences( vo gtk_widget_show( ESubEncoding ); #endif - vbox9=AddVBox( vbox8,0 ); + vbox9=gtkAddVBox( 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 ); - CBDumpSrt=AddCheckButton( MSGTR_PREFERENCES_SUB_SRT,vbox9 ); + CBSubOverlap=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_Overlap,vbox9 ); + CBNoAutoSub=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_AutoLoad,vbox9 ); + CBSubUnicode=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_Unicode,vbox9 ); + CBDumpMPSub=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_MPSUB,vbox9 ); + CBDumpSrt=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_SRT,vbox9 ); - AddHSeparator( vbox9 ); - CBUseASS=AddCheckButton( MSGTR_PREFERENCES_SUB_USE_ASS,vbox9 ); - hbox9=AddHBox( vbox9,0 ); - CBASSUseMargins=AddCheckButton( MSGTR_PREFERENCES_SUB_ASS_USE_MARGINS,hbox9 ); + gtkAddHSeparator( vbox9 ); + CBUseASS=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_USE_ASS,vbox9 ); + hbox9=gtkAddHBox( vbox9,0 ); + CBASSUseMargins=gtkAddCheckButton( MSGTR_PREFERENCES_SUB_ASS_USE_MARGINS,hbox9 ); hbox91=gtk_hbox_new( FALSE,0 ); gtk_widget_set_name( hbox91,"hbox91" ); gtk_box_pack_start( GTK_BOX( hbox9 ),hbox91,TRUE,FALSE,0 ); gtk_widget_show( hbox91 ); - SBASSTopMargin=AddSpinButton( MSGTR_PREFERENCES_SUB_ASS_TOP_MARGIN, + SBASSTopMargin=gtkAddSpinButton( MSGTR_PREFERENCES_SUB_ASS_TOP_MARGIN, (GtkAdjustment *)gtk_adjustment_new(0,0,512,1,8,0),hbox91 ); hbox92=gtk_hbox_new( FALSE,0 ); gtk_widget_set_name( hbox92,"hbox92" ); gtk_box_pack_start( GTK_BOX( hbox9 ),hbox92,TRUE,FALSE,0 ); gtk_widget_show( hbox92 ); - SBASSBottomMargin=AddSpinButton( MSGTR_PREFERENCES_SUB_ASS_BOTTOM_MARGIN, + SBASSBottomMargin=gtkAddSpinButton( MSGTR_PREFERENCES_SUB_ASS_BOTTOM_MARGIN, (GtkAdjustment *)gtk_adjustment_new(0,0,512,1,8,0),hbox92 ); - label=AddLabel( MSGTR_PREFERENCES_SubtitleOSD,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_SubtitleOSD,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),2 ),label ); - vbox601=AddVBox( notebook1,0 ); + vbox601=gtkAddVBox( notebook1,0 ); /* 4th page */ - vbox603=AddVBox( - AddFrame( NULL,GTK_SHADOW_NONE, - AddFrame( MSGTR_PREFERENCES_FRAME_Font,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 ); + vbox603=gtkAddVBox( + gtkAddFrame( NULL,GTK_SHADOW_NONE, + gtkAddFrame( MSGTR_PREFERENCES_FRAME_Font,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 ); - hbox6=AddHBox( vbox603,1 ); - AddLabel( MSGTR_PREFERENCES_Font,hbox6 ); + hbox6=gtkAddHBox( vbox603,1 ); + gtkAddLabel( MSGTR_PREFERENCES_Font,hbox6 ); prEFontName=gtk_entry_new(); gtk_widget_set_name( prEFontName,"prEFontName" ); gtk_widget_show( prEFontName ); gtk_box_pack_start( GTK_BOX( hbox6 ),prEFontName,TRUE,TRUE,0 ); - hbuttonbox5=AddHButtonBox( hbox6 ); + hbuttonbox5=gtkAddHButtonBox( hbox6 ); gtk_container_set_border_width( GTK_CONTAINER( hbuttonbox5 ),3 ); - BLoadFont=AddButton( MSGTR_Browse,hbuttonbox5 ); + BLoadFont=gtkAddButton( MSGTR_Browse,hbuttonbox5 ); #ifndef CONFIG_FREETYPE - hbox7=AddHBox( vbox603,1 ); - AddLabel( MSGTR_PREFERENCES_FontFactor,hbox7 ); + hbox7=gtkAddHBox( vbox603,1 ); + gtkAddLabel( MSGTR_PREFERENCES_FontFactor,hbox7 ); HSFontFactoradj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,10,0.05,0,0 ) ); - HSFontFactor=AddHScaler( HSFontFactoradj,hbox7,2 ); + HSFontFactor=gtkAddHScale( HSFontFactoradj,hbox7,2 ); #else - RBFontNoAutoScale=AddRadioButton( MSGTR_PREFERENCES_FontNoAutoScale,&Font_group,vbox603 ); - RBFontAutoScaleHeight=AddRadioButton( MSGTR_PREFERENCES_FontPropHeight,&Font_group,vbox603 ); - RBFontAutoScaleWidth=AddRadioButton( MSGTR_PREFERENCES_FontPropWidth,&Font_group,vbox603 ); - RBFontAutoScaleDiagonal=AddRadioButton( MSGTR_PREFERENCES_FontPropDiagonal,&Font_group,vbox603 ); + RBFontNoAutoScale=gtkAddRadioButton( MSGTR_PREFERENCES_FontNoAutoScale,&Font_group,vbox603 ); + RBFontAutoScaleHeight=gtkAddRadioButton( MSGTR_PREFERENCES_FontPropHeight,&Font_group,vbox603 ); + RBFontAutoScaleWidth=gtkAddRadioButton( MSGTR_PREFERENCES_FontPropWidth,&Font_group,vbox603 ); + RBFontAutoScaleDiagonal=gtkAddRadioButton( MSGTR_PREFERENCES_FontPropDiagonal,&Font_group,vbox603 ); table1=gtk_table_new( 3,2,FALSE ); gtk_widget_set_name( table1,"table1" ); gtk_widget_show( table1 ); gtk_box_pack_start( GTK_BOX( vbox603 ),table1,FALSE,FALSE,0 ); - label=AddLabel( MSGTR_PREFERENCES_FontEncoding,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontEncoding,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); CBFontEncoding=gtk_combo_new(); @@ -874,52 +874,52 @@ static GtkWidget * CreatePreferences( vo gtk_entry_set_editable( GTK_ENTRY( EFontEncoding ),FALSE ); gtk_widget_show( EFontEncoding ); - label=AddLabel( MSGTR_PREFERENCES_FontBlur,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontBlur,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSFontBluradj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) ); - HSFontBlur=AddHScaler( HSFontBluradj,NULL,2 ); + HSFontBlur=gtkAddHScale( HSFontBluradj,NULL,2 ); gtk_table_attach( GTK_TABLE( table1 ),HSFontBlur,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=AddLabel( MSGTR_PREFERENCES_FontOutLine,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontOutLine,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,2,3,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSFontOutLineadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) ); - HSFontOutLine=AddHScaler( HSFontOutLineadj,NULL,2 ); + HSFontOutLine=gtkAddHScale( HSFontOutLineadj,NULL,2 ); gtk_table_attach( GTK_TABLE( table1 ),HSFontOutLine,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=AddLabel( MSGTR_PREFERENCES_FontTextScale,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontTextScale,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,3,4,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSFontTextScaleadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) ); - HSFontTextScale=AddHScaler( HSFontTextScaleadj,NULL,2 ); + HSFontTextScale=gtkAddHScale( HSFontTextScaleadj,NULL,2 ); gtk_table_attach( GTK_TABLE( table1 ),HSFontTextScale,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=AddLabel( MSGTR_PREFERENCES_FontOSDScale,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FontOSDScale,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,4,5,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); HSFontOSDScaleadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0.1,0,0 ) ); - HSFontOSDScale=AddHScaler( HSFontOSDScaleadj,NULL,2 ); + HSFontOSDScale=gtkAddHScale( HSFontOSDScaleadj,NULL,2 ); gtk_table_attach( GTK_TABLE( table1 ),HSFontOSDScale,1,2,4,5,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); #endif - label=AddLabel( MSGTR_PREFERENCES_FRAME_Font,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_FRAME_Font,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),3 ),label ); /* 5th page */ - vbox601=AddVBox( notebook1,0 ); + vbox601=gtkAddVBox( notebook1,0 ); - vbox602=AddVBox( - AddFrame( NULL,GTK_SHADOW_NONE, - AddFrame( MSGTR_PREFERENCES_FRAME_CodecDemuxer,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 ); + vbox602=gtkAddVBox( + gtkAddFrame( NULL,GTK_SHADOW_NONE, + gtkAddFrame( MSGTR_PREFERENCES_FRAME_CodecDemuxer,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 ); - CBNonInterlaved=AddCheckButton( MSGTR_PREFERENCES_NI,vbox602 ); - CBIndex=AddCheckButton( MSGTR_PREFERENCES_IDX,vbox602 ); + CBNonInterlaved=gtkAddCheckButton( MSGTR_PREFERENCES_NI,vbox602 ); + CBIndex=gtkAddCheckButton( MSGTR_PREFERENCES_IDX,vbox602 ); - hbox5=AddHBox( vbox602,1 ); + hbox5=gtkAddHBox( vbox602,1 ); - AddLabel( MSGTR_PREFERENCES_VideoCodecFamily,hbox5 ); + gtkAddLabel( MSGTR_PREFERENCES_VideoCodecFamily,hbox5 ); CBVFM=gtk_combo_new(); gtk_widget_set_name( CBVFM,"CBVFM" ); @@ -931,9 +931,9 @@ static GtkWidget * CreatePreferences( vo gtk_entry_set_editable( GTK_ENTRY( EVFM ),FALSE ); gtk_widget_show( EVFM ); - hbox5=AddHBox( vbox602,1 ); + hbox5=gtkAddHBox( vbox602,1 ); - AddLabel( MSGTR_PREFERENCES_AudioCodecFamily,hbox5 ); + gtkAddLabel( MSGTR_PREFERENCES_AudioCodecFamily,hbox5 ); CBAFM=gtk_combo_new(); gtk_widget_set_name( CBAFM,"CBAFM" ); @@ -945,98 +945,98 @@ static GtkWidget * CreatePreferences( vo gtk_entry_set_editable( GTK_ENTRY( EAFM ),FALSE ); gtk_widget_show( EAFM ); - label=AddLabel( MSGTR_PREFERENCES_Codecs,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_Codecs,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),4 ),label ); - vbox601=AddVBox( notebook1,0 ); + vbox601=gtkAddVBox( notebook1,0 ); /* 6th page */ - vbox602=AddVBox( - AddFrame( NULL,GTK_SHADOW_NONE, - AddFrame( MSGTR_PREFERENCES_FRAME_PostProcess,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 ); + vbox602=gtkAddVBox( + gtkAddFrame( NULL,GTK_SHADOW_NONE, + gtkAddFrame( MSGTR_PREFERENCES_FRAME_PostProcess,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 ); - CBPostprocess=AddCheckButton( MSGTR_PREFERENCES_PostProcess,vbox602 ); + CBPostprocess=gtkAddCheckButton( MSGTR_PREFERENCES_PostProcess,vbox602 ); - hbox5=AddHBox( vbox602,1 ); + hbox5=gtkAddHBox( vbox602,1 ); - AddLabel( MSGTR_PREFERENCES_AutoQuality,hbox5 ); + gtkAddLabel( MSGTR_PREFERENCES_AutoQuality,hbox5 ); if ( guiInfo.sh_video && guiInfo.Playing ) HSPPQualityadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,get_video_quality_max( guiInfo.sh_video ),0,0,0 ) ); else HSPPQualityadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,100,0,0,0 ) ); - HSPPQuality=AddHScaler( HSPPQualityadj,hbox5,0 ); + HSPPQuality=gtkAddHScale( HSPPQualityadj,hbox5,0 ); - vbox602=AddVBox( - AddFrame( NULL,GTK_SHADOW_NONE, - AddFrame( MSGTR_PREFERENCES_FRAME_Cache,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 ); + vbox602=gtkAddVBox( + gtkAddFrame( NULL,GTK_SHADOW_NONE, + gtkAddFrame( MSGTR_PREFERENCES_FRAME_Cache,GTK_SHADOW_ETCHED_OUT,vbox601,0 ),1 ),0 ); - CBCache=AddCheckButton( MSGTR_PREFERENCES_Cache,vbox602 ); + CBCache=gtkAddCheckButton( MSGTR_PREFERENCES_Cache,vbox602 ); - hbox5=AddHBox( vbox602,1 ); + hbox5=gtkAddHBox( vbox602,1 ); - AddLabel( MSGTR_PREFERENCES_CacheSize,hbox5 ); + gtkAddLabel( MSGTR_PREFERENCES_CacheSize,hbox5 ); SBCacheadj=GTK_ADJUSTMENT( gtk_adjustment_new( gtkCacheSize,32,0x7fffffff,1,32,0 ) ); SBCache=gtk_spin_button_new( GTK_ADJUSTMENT( SBCacheadj ),1,0 ); gtk_widget_show( SBCache ); gtk_box_pack_start( GTK_BOX( hbox5 ),SBCache,TRUE,TRUE,0 ); - vbox602=AddVBox( - AddFrame( NULL,GTK_SHADOW_NONE, - AddFrame( MSGTR_PREFERENCES_FRAME_Misc,GTK_SHADOW_ETCHED_OUT,vbox601,1 ),1 ),0 ); + vbox602=gtkAddVBox( + gtkAddFrame( NULL,GTK_SHADOW_NONE, + gtkAddFrame( MSGTR_PREFERENCES_FRAME_Misc,GTK_SHADOW_ETCHED_OUT,vbox601,1 ),1 ),0 ); - CBShowVideoWindow=AddCheckButton( MSGTR_PREFERENCES_ShowVideoWindow,vbox602 ); - CBLoadFullscreen=AddCheckButton( MSGTR_PREFERENCES_LoadFullscreen,vbox602 ); - CBSaveWinPos=AddCheckButton( MSGTR_PREFERENCES_SaveWinPos,vbox602 ); - CBStopXScreenSaver=AddCheckButton( MSGTR_PREFERENCES_XSCREENSAVER,vbox602 ); - CBPlayBar=AddCheckButton( MSGTR_PREFERENCES_PlayBar,vbox602 ); - CBNoIdle=AddCheckButton( MSGTR_PREFERENCES_NoIdle,vbox602 ); + CBShowVideoWindow=gtkAddCheckButton( MSGTR_PREFERENCES_ShowVideoWindow,vbox602 ); + CBLoadFullscreen=gtkAddCheckButton( MSGTR_PREFERENCES_LoadFullscreen,vbox602 ); + CBSaveWinPos=gtkAddCheckButton( MSGTR_PREFERENCES_SaveWinPos,vbox602 ); + CBStopXScreenSaver=gtkAddCheckButton( MSGTR_PREFERENCES_XSCREENSAVER,vbox602 ); + CBPlayBar=gtkAddCheckButton( MSGTR_PREFERENCES_PlayBar,vbox602 ); + CBNoIdle=gtkAddCheckButton( MSGTR_PREFERENCES_NoIdle,vbox602 ); - AddHSeparator( vbox602 ); + gtkAddHSeparator( vbox602 ); - CBAutoSync=AddCheckButton( MSGTR_PREFERENCES_AutoSync,vbox602 ); - hbox5=AddHBox( vbox602,1 ); - AddLabel( MSGTR_PREFERENCES_AutoSyncValue,hbox5 ); + CBAutoSync=gtkAddCheckButton( MSGTR_PREFERENCES_AutoSync,vbox602 ); + hbox5=gtkAddHBox( vbox602,1 ); + gtkAddLabel( MSGTR_PREFERENCES_AutoSyncValue,hbox5 ); SBAutoSyncadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,10000,1,10,10 ) ); SBAutoSync=gtk_spin_button_new( GTK_ADJUSTMENT( SBAutoSyncadj ),1,0 ); gtk_widget_show( SBAutoSync ); gtk_box_pack_start( GTK_BOX( hbox5 ),SBAutoSync,TRUE,TRUE,0 ); - AddHSeparator( vbox602 ); + gtkAddHSeparator( vbox602 ); table1=gtk_table_new( 2,2,FALSE ); gtk_widget_set_name( table1,"table1" ); gtk_widget_show( table1 ); gtk_box_pack_start( GTK_BOX( vbox602 ),table1,FALSE,FALSE,0 ); - label=AddLabel( MSGTR_PREFERENCES_DVDDevice,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_DVDDevice,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); prEDVDDevice=gtk_entry_new(); gtk_widget_set_name( prEDVDDevice,"prEDVDDevice" ); gtk_widget_show( prEDVDDevice ); gtk_table_attach( GTK_TABLE( table1 ),prEDVDDevice,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); - label=AddLabel( MSGTR_PREFERENCES_CDROMDevice,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_CDROMDevice,NULL ); gtk_table_attach( GTK_TABLE( table1 ),label,0,1,1,2,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); prECDRomDevice=gtk_entry_new(); gtk_widget_set_name( prECDRomDevice,"prECDRomDevice" ); gtk_widget_show( prECDRomDevice ); gtk_table_attach( GTK_TABLE( table1 ),prECDRomDevice,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 ); -// AddHSeparator( vbox602 ); +// gtkAddHSeparator( vbox602 ); - label=AddLabel( MSGTR_PREFERENCES_Misc,NULL ); + label=gtkAddLabel( MSGTR_PREFERENCES_Misc,NULL ); gtk_notebook_set_tab_label( GTK_NOTEBOOK( notebook1 ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( notebook1 ),5 ),label ); /* --- */ - AddHSeparator( vbox1 ); + gtkAddHSeparator( vbox1 ); - hbuttonbox1=AddHButtonBox( vbox1 ); + hbuttonbox1=gtkAddHButtonBox( vbox1 ); gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END ); gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 ); - BOk=AddButton( MSGTR_Ok,hbuttonbox1 ); - BCancel=AddButton( MSGTR_Cancel,hbuttonbox1 ); + BOk=gtkAddButton( MSGTR_Ok,hbuttonbox1 ); + BCancel=gtkAddButton( MSGTR_Cancel,hbuttonbox1 ); gtk_widget_add_accelerator( BOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( BCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); @@ -1575,17 +1575,17 @@ static GtkWidget *CreateAudioConfig( voi gtk_widget_realize(AudioConfig); gtkAddIcon(AudioConfig); - vbox = AddVBox(AddDialogFrame(AudioConfig), 0); + vbox = gtkAddVBox(gtkAddDialogFrame(AudioConfig), 0); table = gtk_table_new(2, 3, FALSE); gtk_widget_set_name(table, "table"); gtk_widget_show(table); gtk_box_pack_start(GTK_BOX(vbox), table, TRUE, TRUE, 0); - label = AddLabel(MSGTR_PREFERENCES_Audio_Device, NULL); + label = gtkAddLabel(MSGTR_PREFERENCES_Audio_Device, NULL); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - CBAudioDevice = AddComboBox(NULL); + CBAudioDevice = gtkAddCombo(NULL); gtk_table_attach(GTK_TABLE(table), CBAudioDevice, 1, 2, 0, 1, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); items = g_list_append(items,(gpointer)MSGTR_PREFERENCES_DriverDefault); #ifdef CONFIG_OSS_AUDIO @@ -1612,10 +1612,10 @@ static GtkWidget *CreateAudioConfig( voi gtk_widget_set_name(CEAudioDevice, "CEAudioDevice"); gtk_widget_show(CEAudioDevice); - label = AddLabel(MSGTR_PREFERENCES_Audio_Mixer, NULL); + label = gtkAddLabel(MSGTR_PREFERENCES_Audio_Mixer, NULL); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - CBAudioMixer = AddComboBox(NULL); + CBAudioMixer = gtkAddCombo(NULL); gtk_table_attach(GTK_TABLE(table), CBAudioMixer, 1, 2, 1, 2, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); items = g_list_append(items, (gpointer)MSGTR_PREFERENCES_DriverDefault); #ifdef CONFIG_OSS_AUDIO @@ -1634,10 +1634,10 @@ static GtkWidget *CreateAudioConfig( voi gtk_widget_set_name(CEAudioMixer, "CEAudioMixer"); gtk_widget_show(CEAudioMixer); - label = AddLabel(MSGTR_PREFERENCES_Audio_MixerChannel, NULL); + label = gtkAddLabel(MSGTR_PREFERENCES_Audio_MixerChannel, NULL); gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, (GtkAttachOptions)(GTK_FILL), (GtkAttachOptions)(0), 0, 0); - CBAudioMixerChannel = AddComboBox(NULL); + CBAudioMixerChannel = gtkAddCombo(NULL); gtk_table_attach(GTK_TABLE(table), CBAudioMixerChannel, 1, 2, 2, 3, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(0), 0, 0); items = g_list_append(items, (gpointer)MSGTR_PREFERENCES_DriverDefault); #ifdef CONFIG_OSS_AUDIO @@ -1656,13 +1656,13 @@ static GtkWidget *CreateAudioConfig( voi gtk_widget_set_name(CEAudioMixerChannel, "CEAudioMixerChannel"); gtk_widget_show(CEAudioMixerChannel); - AddHSeparator(vbox); + gtkAddHSeparator(vbox); - hbuttonbox = AddHButtonBox(vbox); + hbuttonbox = gtkAddHButtonBox(vbox); gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox), GTK_BUTTONBOX_END); gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox), 10); - BAudioOk = AddButton(MSGTR_Ok, hbuttonbox); - BAudioCancel = AddButton(MSGTR_Cancel, hbuttonbox); + BAudioOk = gtkAddButton(MSGTR_Ok, hbuttonbox); + BAudioCancel = gtkAddButton(MSGTR_Cancel, hbuttonbox); gtk_signal_connect(GTK_OBJECT(AudioConfig), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &AudioConfig); gtk_signal_connect(GTK_OBJECT(BAudioOk), "clicked", GTK_SIGNAL_FUNC(audioButton), (void*)1); @@ -1776,12 +1776,12 @@ GtkWidget * CreateDXR3Config( void ) gtk_widget_realize( DXR3Config ); gtkAddIcon( DXR3Config ); - vbox1=AddVBox( AddDialogFrame( DXR3Config ),0 ); - vbox2=AddVBox( vbox1,0 ); - hbox1=AddHBox( vbox2,1 ); - AddLabel( MSGTR_PREFERENCES_Audio_Device,hbox1 ); + vbox1=gtkAddVBox( gtkAddDialogFrame( DXR3Config ),0 ); + vbox2=gtkAddVBox( vbox1,0 ); + hbox1=gtkAddHBox( vbox2,1 ); + gtkAddLabel( MSGTR_PREFERENCES_Audio_Device,hbox1 ); - CBDevice=AddComboBox( hbox1 ); + CBDevice=gtkAddCombo( hbox1 ); CBDevice_items=g_list_append( CBDevice_items,( gpointer ) "/dev/em8300" ); CBDevice_items=g_list_append( CBDevice_items,( gpointer ) "/dev/em8300-0" ); @@ -1796,19 +1796,19 @@ GtkWidget * CreateDXR3Config( void ) gtk_widget_show( CEDXR3Device ); gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),"/dev/em8300" ); - AddHSeparator( vbox2 ); - vbox3=AddVBox( vbox2,0 ); - AddLabel( MSGTR_PREFERENCES_DXR3_VENC,vbox3 ); - RBVNone=AddRadioButton( MSGTR_PREFERENCES_None,&VEncoder_group,vbox3 ); - RBVLavc=AddRadioButton( MSGTR_PREFERENCES_DXR3_LAVC,&VEncoder_group,vbox3 ); + gtkAddHSeparator( vbox2 ); + vbox3=gtkAddVBox( vbox2,0 ); + gtkAddLabel( MSGTR_PREFERENCES_DXR3_VENC,vbox3 ); + RBVNone=gtkAddRadioButton( MSGTR_PREFERENCES_None,&VEncoder_group,vbox3 ); + RBVLavc=gtkAddRadioButton( MSGTR_PREFERENCES_DXR3_LAVC,&VEncoder_group,vbox3 ); - AddHSeparator( vbox1 ); + gtkAddHSeparator( vbox1 ); - hbuttonbox1=AddHButtonBox( vbox1 ); + hbuttonbox1=gtkAddHButtonBox( vbox1 ); gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END ); gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 ); - dxr3BOk=AddButton( MSGTR_Ok,hbuttonbox1 ); - dxr3BCancel=AddButton( MSGTR_Cancel,hbuttonbox1 ); + dxr3BOk=gtkAddButton( MSGTR_Ok,hbuttonbox1 ); + dxr3BCancel=gtkAddButton( MSGTR_Cancel,hbuttonbox1 ); gtk_widget_add_accelerator( dxr3BOk,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( dxr3BCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Sun Mar 31 19:41:18 2013 (r36116) +++ trunk/gui/dialog/skinbrowser.c Sun Mar 31 20:08:37 2013 (r36117) @@ -112,9 +112,9 @@ static GtkWidget * CreateSkinBrowser( vo gtk_widget_realize( SkinBrowser ); gtkAddIcon( SkinBrowser ); - vbox5=AddVBox( AddDialogFrame( SkinBrowser ),0 ); - AddLabel( MSGTR_SKIN_LABEL,vbox5 ); - AddHSeparator( vbox5 ); + vbox5=gtkAddVBox( gtkAddDialogFrame( SkinBrowser ),0 ); + gtkAddLabel( MSGTR_SKIN_LABEL,vbox5 ); + gtkAddHSeparator( vbox5 ); scrolledwindow1=gtk_scrolled_window_new( NULL,NULL ); gtk_widget_set_name( scrolledwindow1,"scrolledwindow1" ); @@ -136,14 +136,14 @@ static GtkWidget * CreateSkinBrowser( vo gtk_clist_column_titles_hide( GTK_CLIST( SkinList ) ); gtk_clist_set_shadow_type( GTK_CLIST( SkinList ),GTK_SHADOW_ETCHED_OUT ); - AddHSeparator( vbox5 ); + gtkAddHSeparator( vbox5 ); - hbuttonbox4=AddHButtonBox( vbox5 ); + hbuttonbox4=gtkAddHButtonBox( vbox5 ); gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox4 ),GTK_BUTTONBOX_SPREAD ); gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox4 ),10 ); - Ok=AddButton( MSGTR_Ok,hbuttonbox4 ); - Cancel=AddButton( MSGTR_Cancel,hbuttonbox4 ); + Ok=gtkAddButton( MSGTR_Ok,hbuttonbox4 ); + Cancel=gtkAddButton( MSGTR_Cancel,hbuttonbox4 ); gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); Modified: trunk/gui/dialog/tools.c ============================================================================== --- trunk/gui/dialog/tools.c Sun Mar 31 19:41:18 2013 (r36116) +++ trunk/gui/dialog/tools.c Sun Mar 31 20:08:37 2013 (r36117) @@ -21,18 +21,18 @@ #include "tools.h" -GtkWidget * AddDialogFrame( GtkWidget * parent ) +GtkWidget * gtkAddDialogFrame( GtkWidget * parent ) { GtkWidget * frame; - frame=AddFrame( NULL,GTK_SHADOW_IN,parent,1 ); + frame=gtkAddFrame( NULL,GTK_SHADOW_IN,parent,1 ); gtk_container_set_border_width( GTK_CONTAINER( frame ),1 ); - frame=AddFrame( NULL,GTK_SHADOW_NONE,frame,1 ); - frame=AddFrame( NULL,GTK_SHADOW_ETCHED_OUT,frame,1 ); - frame=AddFrame( NULL,GTK_SHADOW_NONE,frame,1 ); + frame=gtkAddFrame( NULL,GTK_SHADOW_NONE,frame,1 ); + frame=gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,frame,1 ); + frame=gtkAddFrame( NULL,GTK_SHADOW_NONE,frame,1 ); return frame; } -GtkWidget * AddFrame( const char * title,int type,GtkWidget * parent,int add ) +GtkWidget * gtkAddFrame( const char * title,int type,GtkWidget * parent,int add ) { GtkWidget * frame = NULL; frame=gtk_frame_new( title ); @@ -45,7 +45,7 @@ GtkWidget * AddFrame( const char * title return frame; } -GtkWidget * AddLabel( const char * title,GtkWidget * parent ) +GtkWidget * gtkAddLabel( const char * title,GtkWidget * parent ) { GtkWidget * label; label=gtk_label_new( title ); @@ -57,7 +57,7 @@ GtkWidget * AddLabel( const char * title return label; } -GtkWidget * AddVBox( GtkWidget * parent,int type ) +GtkWidget * gtkAddVBox( GtkWidget * parent,int type ) { GtkWidget * vbox; vbox=gtk_vbox_new( FALSE,0 ); @@ -71,7 +71,7 @@ GtkWidget * AddVBox( GtkWidget * parent, return vbox; } -GtkWidget * AddHBox( GtkWidget * parent,int type ) +GtkWidget * gtkAddHBox( GtkWidget * parent,int type ) { GtkWidget * hbox; hbox=gtk_hbox_new( FALSE,0 ); @@ -85,7 +85,7 @@ GtkWidget * AddHBox( GtkWidget * parent, return hbox; } -GtkWidget * AddCheckButton( const char * title, GtkWidget * parent ) +GtkWidget * gtkAddCheckButton( const char * title, GtkWidget * parent ) { GtkWidget * CB; CB=gtk_check_button_new_with_label( title ); @@ -95,7 +95,7 @@ GtkWidget * AddCheckButton( const char * return CB; } -GtkWidget * AddRadioButton( const char * title,GSList ** group,GtkWidget * parent ) +GtkWidget * gtkAddRadioButton( const char * title,GSList ** group,GtkWidget * parent ) { GtkWidget * RB; RB=gtk_radio_button_new_with_label( *group,title ); @@ -106,7 +106,7 @@ GtkWidget * AddRadioButton( const char * return RB; } -GtkWidget * AddSpinButton( const char * title,GtkAdjustment * adj,GtkWidget * parent ) +GtkWidget * gtkAddSpinButton( const char * title,GtkAdjustment * adj,GtkWidget * parent ) { GtkWidget * SB; GtkWidget * label; @@ -121,7 +121,7 @@ GtkWidget * AddSpinButton( const char * return SB; } -GtkWidget * AddButton( const char * title,GtkWidget * parent ) +GtkWidget * gtkAddButton( const char * title,GtkWidget * parent ) { GtkWidget * B; B=gtk_button_new_with_label( title ); @@ -131,7 +131,7 @@ GtkWidget * AddButton( const char * titl return B; } -GtkWidget * AddHSeparator( GtkWidget * parent ) +GtkWidget * gtkAddHSeparator( GtkWidget * parent ) { GtkWidget * hseparator; hseparator=gtk_hseparator_new(); @@ -142,7 +142,7 @@ GtkWidget * AddHSeparator( GtkWidget * p return hseparator; } -GtkWidget * AddHButtonBox( GtkWidget * parent ) +GtkWidget * gtkAddHButtonBox( GtkWidget * parent ) { GtkWidget * hbuttonbox; hbuttonbox=gtk_hbutton_box_new(); @@ -153,7 +153,7 @@ GtkWidget * AddHButtonBox( GtkWidget * p return hbuttonbox; } -GtkWidget * AddHScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ) +GtkWidget * gtkAddHScale( GtkAdjustment * adj,GtkWidget * parent,int digit ) { GtkWidget * HS; HS=gtk_hscale_new( adj ); @@ -165,7 +165,7 @@ GtkWidget * AddHScaler( GtkAdjustment * return HS; } -GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ) +GtkWidget * gtkAddVScale( GtkAdjustment * adj,GtkWidget * parent,int digit ) { GtkWidget * VS; VS=gtk_vscale_new( adj ); @@ -178,7 +178,7 @@ GtkWidget * AddVScaler( GtkAdjustment * return VS; } -GtkWidget * AddComboBox( GtkWidget * parent ) +GtkWidget * gtkAddCombo( GtkWidget * parent ) { GtkWidget * CB; CB=gtk_combo_new(); Modified: trunk/gui/dialog/tools.h ============================================================================== --- trunk/gui/dialog/tools.h Sun Mar 31 19:41:18 2013 (r36116) +++ trunk/gui/dialog/tools.h Sun Mar 31 20:08:37 2013 (r36117) @@ -22,19 +22,19 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -GtkWidget * AddDialogFrame( GtkWidget * parent ); -GtkWidget * AddFrame( const char * title, int type, GtkWidget * parent, int add ); -GtkWidget * AddLabel( const char * title, GtkWidget * parent ); -GtkWidget * AddVBox( GtkWidget * parent, int type ); -GtkWidget * AddHBox( GtkWidget * parent, int type ); -GtkWidget * AddCheckButton( const char * title, GtkWidget * parent ); -GtkWidget * AddRadioButton( const char * title, GSList ** group, GtkWidget * parent ); -GtkWidget * AddSpinButton( const char * title, GtkAdjustment * adj, GtkWidget * parent ); -GtkWidget * AddButton( const char * title, GtkWidget * parent ); -GtkWidget * AddHSeparator( GtkWidget * parent ); -GtkWidget * AddHButtonBox( GtkWidget * parent ); -GtkWidget * AddHScaler( GtkAdjustment * adj, GtkWidget * parent, int digit ); -GtkWidget * AddVScaler( GtkAdjustment * adj, GtkWidget * parent, int digit ); -GtkWidget * AddComboBox( GtkWidget * parent ); +GtkWidget * gtkAddDialogFrame( GtkWidget * parent ); +GtkWidget * gtkAddFrame( const char * title, int type, GtkWidget * parent, int add ); +GtkWidget * gtkAddLabel( const char * title, GtkWidget * parent ); +GtkWidget * gtkAddVBox( GtkWidget * parent, int type ); +GtkWidget * gtkAddHBox( GtkWidget * parent, int type ); +GtkWidget * gtkAddCheckButton( const char * title, GtkWidget * parent ); +GtkWidget * gtkAddRadioButton( const char * title, GSList ** group, GtkWidget * parent ); +GtkWidget * gtkAddSpinButton( const char * title, GtkAdjustment * adj, GtkWidget * parent ); +GtkWidget * gtkAddButton( const char * title, GtkWidget * parent ); +GtkWidget * gtkAddHSeparator( GtkWidget * parent ); +GtkWidget * gtkAddHButtonBox( GtkWidget * parent ); +GtkWidget * gtkAddHScale( GtkAdjustment * adj, GtkWidget * parent, int digit ); +GtkWidget * gtkAddVScale( GtkAdjustment * adj, GtkWidget * parent, int digit ); +GtkWidget * gtkAddCombo( GtkWidget * parent ); #endif /* MPLAYER_GUI_TOOLS_H */ Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Sun Mar 31 19:41:18 2013 (r36116) +++ trunk/gui/dialog/url.c Sun Mar 31 20:08:37 2013 (r36117) @@ -97,11 +97,11 @@ static GtkWidget *CreateURLDialog(void) gtk_widget_realize(URLDialog); gtkAddIcon(URLDialog); - vbox1 = AddVBox(AddDialogFrame(URLDialog), 0); - hbox1 = AddHBox(vbox1, 1); - AddLabel("URL: ", hbox1); + vbox1 = gtkAddVBox(gtkAddDialogFrame(URLDialog), 0); + hbox1 = gtkAddHBox(vbox1, 1); + gtkAddLabel("URL: ", hbox1); - URLCombo = AddComboBox(hbox1); + URLCombo = gtkAddCombo(hbox1); /* * gtk_combo_new(); * gtk_widget_set_name( URLCombo,"URLCombo" ); @@ -112,14 +112,14 @@ static GtkWidget *CreateURLDialog(void) gtk_widget_set_name(URLEntry, "URLEntry"); gtk_widget_show(URLEntry); - AddHSeparator(vbox1); + gtkAddHSeparator(vbox1); - hbuttonbox1 = AddHButtonBox(vbox1); + hbuttonbox1 = gtkAddHButtonBox(vbox1); gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox1), GTK_BUTTONBOX_END); gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox1), 10); - Ok = AddButton(MSGTR_Ok, hbuttonbox1); - Cancel = AddButton(MSGTR_Cancel, hbuttonbox1); + Ok = gtkAddButton(MSGTR_Ok, hbuttonbox1); + Cancel = gtkAddButton(MSGTR_Cancel, hbuttonbox1); gtk_widget_add_accelerator(Ok, "clicked", accel_group, GDK_Return, 0, GTK_ACCEL_VISIBLE); gtk_widget_add_accelerator(Cancel, "clicked", accel_group, GDK_Escape, 0, GTK_ACCEL_VISIBLE);

1 0

r36116 - trunk/gui/dialog/dialog.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 19:41:18 2013 New Revision: 36116 Log: Cosmetic: Relocate gtkSelectInCList(). Modified: trunk/gui/dialog/dialog.c Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Sun Mar 31 19:38:13 2013 (r36115) +++ trunk/gui/dialog/dialog.c Sun Mar 31 19:41:18 2013 (r36116) @@ -203,14 +203,6 @@ int gtkFindCList(GtkWidget *list, char * return -1; } -static void gtkSelectInCList(GtkWidget *list, char *item) -{ - gint i; - - if ((i = gtkFindCList(list, item)) > -1) - gtk_clist_select_row(GTK_CLIST(list), i, 0); -} - void gtkEventHandling(void) { int i; @@ -285,6 +277,14 @@ void gtkRaise(GtkWidget *window) wsWindowRaiseTop(gdk_display, GDK_WINDOW_XWINDOW(window->window)); } +static void gtkSelectInCList(GtkWidget *list, char *item) +{ + gint i; + + if ((i = gtkFindCList(list, item)) > -1) + gtk_clist_select_row(GTK_CLIST(list), i, 0); +} + void gtkShow(int type, char *param) { switch (type) {

1 0

r36115 - in trunk/gui/dialog: dialog.c dialog.h
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 19:38:13 2013 New Revision: 36115 Log: Make gtkSetDefaultToCList() static. It only has file scope. Additionally, rename it gtkSelectInCList(). Modified: trunk/gui/dialog/dialog.c trunk/gui/dialog/dialog.h Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Sun Mar 31 19:36:04 2013 (r36114) +++ trunk/gui/dialog/dialog.c Sun Mar 31 19:38:13 2013 (r36115) @@ -203,7 +203,7 @@ int gtkFindCList(GtkWidget *list, char * return -1; } -void gtkSetDefaultToCList(GtkWidget *list, char *item) +static void gtkSelectInCList(GtkWidget *list, char *item) { gint i; @@ -299,7 +299,7 @@ void gtkShow(int type, char *param) // gtk_clist_clear(GTK_CLIST(SkinList)); if (gtkFillSkinList(sbMPlayerPrefixDir) && gtkFillSkinList(sbMPlayerDirInHome)) { - gtkSetDefaultToCList(SkinList, param); + gtkSelectInCList(SkinList, param); gtk_clist_sort(GTK_CLIST(SkinList)); gtk_widget_show(SkinBrowser); gtkSetLayer(SkinBrowser); Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Sun Mar 31 19:36:04 2013 (r36114) +++ trunk/gui/dialog/dialog.h Sun Mar 31 19:38:13 2013 (r36115) @@ -67,7 +67,6 @@ void gtkInit(char *display_name); void gtkAddIcon(GtkWidget *window); int gtkFillSkinList(gchar *dir); -void gtkSetDefaultToCList(GtkWidget *list, char *item); int gtkFindCList(GtkWidget *list, char *item); void gtkEventHandling(void);

1 0

r36114 - in trunk/gui/dialog: dialog.c dialog.h
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 19:36:04 2013 New Revision: 36114 Log: Remove unused gtkClearList(). Modified: trunk/gui/dialog/dialog.c trunk/gui/dialog/dialog.h Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Sun Mar 31 19:08:30 2013 (r36113) +++ trunk/gui/dialog/dialog.c Sun Mar 31 19:36:04 2013 (r36114) @@ -188,11 +188,6 @@ void gtkAddIcon(GtkWidget *window) wsWindowIcon(gdk_display, GDK_WINDOW_XWINDOW(window->window), &guiIcon); } -void gtkClearList(GtkWidget *list) -{ - gtk_clist_clear(GTK_CLIST(list)); -} - int gtkFindCList(GtkWidget *list, char *item) { gint j; @@ -301,7 +296,7 @@ void gtkShow(int type, char *param) case evSkinBrowser: ShowSkinBrowser(); -// gtkClearList( SkinList ); +// gtk_clist_clear(GTK_CLIST(SkinList)); if (gtkFillSkinList(sbMPlayerPrefixDir) && gtkFillSkinList(sbMPlayerDirInHome)) { gtkSetDefaultToCList(SkinList, param); Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Sun Mar 31 19:08:30 2013 (r36113) +++ trunk/gui/dialog/dialog.h Sun Mar 31 19:36:04 2013 (r36114) @@ -67,7 +67,6 @@ void gtkInit(char *display_name); void gtkAddIcon(GtkWidget *window); int gtkFillSkinList(gchar *dir); -void gtkClearList(GtkWidget *list); void gtkSetDefaultToCList(GtkWidget *list, char *item); int gtkFindCList(GtkWidget *list, char *item);

1 0

r36113 - in trunk/gui/dialog: about.c dialog.c dialog.h equalizer.c fileselect.c playlist.c preferences.c skinbrowser.c url.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 19:08:30 2013 New Revision: 36113 Log: Cosmetic: Rename gtkActive() gtkRaise(). Modified: trunk/gui/dialog/about.c trunk/gui/dialog/dialog.c trunk/gui/dialog/dialog.h trunk/gui/dialog/equalizer.c trunk/gui/dialog/fileselect.c trunk/gui/dialog/playlist.c trunk/gui/dialog/preferences.c trunk/gui/dialog/skinbrowser.c trunk/gui/dialog/url.c Modified: trunk/gui/dialog/about.c ============================================================================== --- trunk/gui/dialog/about.c Sun Mar 31 14:42:47 2013 (r36112) +++ trunk/gui/dialog/about.c Sun Mar 31 19:08:30 2013 (r36113) @@ -352,7 +352,7 @@ static GtkWidget * CreateAbout( void ) void ShowAbout( void ) { - if ( About ) gtkActive( About ); + if ( About ) gtkRaise( About ); else About=CreateAbout(); gtk_widget_show( About ); } Modified: trunk/gui/dialog/dialog.c ============================================================================== --- trunk/gui/dialog/dialog.c Sun Mar 31 14:42:47 2013 (r36112) +++ trunk/gui/dialog/dialog.c Sun Mar 31 19:08:30 2013 (r36113) @@ -277,7 +277,7 @@ void gtkMessageBox(int type, const gchar void gtkSetLayer(GtkWidget *window) { wsWindowLayer(gdk_display, GDK_WINDOW_XWINDOW(window->window), guiApp.videoWindow.isFullScreen); - gtkActive(window); + gtkRaise(window); } /** @@ -285,7 +285,7 @@ void gtkSetLayer(GtkWidget *window) * * @param window pointer to a GtkWindow widget */ -void gtkActive(GtkWidget *window) +void gtkRaise(GtkWidget *window) { wsWindowRaiseTop(gdk_display, GDK_WINDOW_XWINDOW(window->window)); } Modified: trunk/gui/dialog/dialog.h ============================================================================== --- trunk/gui/dialog/dialog.h Sun Mar 31 14:42:47 2013 (r36112) +++ trunk/gui/dialog/dialog.h Sun Mar 31 19:08:30 2013 (r36113) @@ -76,6 +76,6 @@ void gtkEventHandling(void); void gtkShow(int type, char *param); void gtkMessageBox(int type, const gchar *str); void gtkSetLayer(GtkWidget *window); -void gtkActive(GtkWidget *window); +void gtkRaise(GtkWidget *window); #endif /* MPLAYER_GUI_DIALOG_H */ Modified: trunk/gui/dialog/equalizer.c ============================================================================== --- trunk/gui/dialog/equalizer.c Sun Mar 31 14:42:47 2013 (r36112) +++ trunk/gui/dialog/equalizer.c Sun Mar 31 19:08:30 2013 (r36113) @@ -474,7 +474,7 @@ static GtkWidget * CreateEqualizer( void void ShowEqualizer( void ) { - if ( Equalizer ) gtkActive( Equalizer ); + if ( Equalizer ) gtkRaise( Equalizer ); else Equalizer=CreateEqualizer(); if ( !gtkEquChannel1 ) gtkEquChannel1=strdup( MSGTR_EQU_Front_Right ); @@ -537,7 +537,7 @@ void ShowEquConfig( void ) { GList * Items = NULL; - if ( EquConfig ) gtkActive( EquConfig ); + if ( EquConfig ) gtkRaise( EquConfig ); else EquConfig=CreateEquConfig(); Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Right ); Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Sun Mar 31 14:42:47 2013 (r36112) +++ trunk/gui/dialog/fileselect.c Sun Mar 31 19:08:30 2013 (r36113) @@ -726,7 +726,7 @@ void ShowFileSelector(int type) struct stat f; if (FileSelector) - gtkActive(FileSelector); + gtkRaise(FileSelector); else FileSelector = CreateFileSelect(); Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Sun Mar 31 14:42:47 2013 (r36112) +++ trunk/gui/dialog/playlist.c Sun Mar 31 19:08:30 2013 (r36113) @@ -586,7 +586,7 @@ void ShowPlaylist( void ) { plItem * next; - if ( Playlist ) gtkActive( Playlist ); + if ( Playlist ) gtkRaise( Playlist ); else Playlist=CreatePlaylist(); if ( old_path && *old_path ) Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Sun Mar 31 14:42:47 2013 (r36112) +++ trunk/gui/dialog/preferences.c Sun Mar 31 19:08:30 2013 (r36113) @@ -447,7 +447,7 @@ static void prToggled( GtkToggleButton * if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBShowVideoWindow ) ) ) { window=wsShowWindow; - gtkActive( Preferences ); + gtkRaise( Preferences ); } else window=wsHideWindow; // NOTE TO MYSELF: doesn't work with a fullscreen window if ( !guiInfo.Playing ) wsWindowVisibility( &guiApp.videoWindow,window ); @@ -1097,7 +1097,7 @@ static GtkWidget * CreatePreferences( vo void ShowPreferences( void ) { - if ( Preferences ) gtkActive( Preferences ); + if ( Preferences ) gtkRaise( Preferences ); else Preferences=CreatePreferences(); /* 1st page */ @@ -1677,7 +1677,7 @@ static GtkWidget *CreateAudioConfig( voi } void ShowAudioConfig( void ) { - if (AudioConfig) gtkActive(AudioConfig); + if (AudioConfig) gtkRaise(AudioConfig); else AudioConfig = CreateAudioConfig(); #ifdef CONFIG_OSS_AUDIO @@ -1723,7 +1723,7 @@ GtkWidget * CreateDXR3Config( void ); void ShowDXR3Config( void ) { - if ( DXR3Config ) gtkActive( DXR3Config ); + if ( DXR3Config ) gtkRaise( DXR3Config ); else DXR3Config=CreateDXR3Config(); gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),gtkDXR3Device ); Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Sun Mar 31 14:42:47 2013 (r36112) +++ trunk/gui/dialog/skinbrowser.c Sun Mar 31 19:08:30 2013 (r36113) @@ -75,7 +75,7 @@ static void on_SkinList_select_row( GtkC { prev=sbSelectedSkin; uiChangeSkin( sbSelectedSkin ); - gtkActive( SkinBrowser ); + gtkRaise( SkinBrowser ); } if( !event ) return; if( event->type == GDK_2BUTTON_PRESS ) @@ -166,7 +166,7 @@ static GtkWidget * CreateSkinBrowser( vo void ShowSkinBrowser( void ) { - if ( SkinBrowser ) gtkActive( SkinBrowser ); + if ( SkinBrowser ) gtkRaise( SkinBrowser ); else SkinBrowser=CreateSkinBrowser(); } Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Sun Mar 31 14:42:47 2013 (r36112) +++ trunk/gui/dialog/url.c Sun Mar 31 19:08:30 2013 (r36113) @@ -139,7 +139,7 @@ void ShowURLDialog(void) urlItem *item; if (URLDialog) - gtkActive(URLDialog); + gtkRaise(URLDialog); else URLDialog = CreateURLDialog();

1 0

r36112 - trunk/gui/dialog/url.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 14:42:47 2013 New Revision: 36112 Log: Add, group and sort #includes, remove unneeded ones. Modified: trunk/gui/dialog/url.c Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Sun Mar 31 14:18:41 2013 (r36111) +++ trunk/gui/dialog/url.c Sun Mar 31 14:42:47 2013 (r36112) @@ -16,25 +16,21 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <sys/types.h> -#include <sys/stat.h> -#include <unistd.h> -#include <stdlib.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> -#include <gdk/gdkkeysyms.h> -#include <gtk/gtk.h> - #include "url.h" +#include "dialog.h" #include "tools.h" -#include "gui/interface.h" #include "gui/app/app.h" +#include "gui/interface.h" #include "gui/ui/actions.h" -#include "dialog.h" #include "gui/util/list.h" #include "gui/util/string.h" + #include "help_mp.h" +#include "stream/stream.h" GtkWidget *URLDialog = NULL;

1 0

r36111 - in trunk/gui/dialog: url.c url.h
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 14:18:41 2013 New Revision: 36111 Log: Cosmetic: Format to MPlayer coding style. Modified: trunk/gui/dialog/url.c trunk/gui/dialog/url.h Modified: trunk/gui/dialog/url.c ============================================================================== --- trunk/gui/dialog/url.c Sun Mar 31 14:10:42 2013 (r36110) +++ trunk/gui/dialog/url.c Sun Mar 31 14:18:41 2013 (r36111) @@ -36,132 +36,133 @@ #include "gui/util/string.h" #include "help_mp.h" -GtkWidget * URLDialog = NULL; +GtkWidget *URLDialog = NULL; -static GtkWidget * URLCombo; -static GtkWidget * URLEntry; -static GList * URLComboEntrys = NULL; +static GtkWidget *URLCombo; +static GtkWidget *URLEntry; +static GList *URLComboEntrys = NULL; -static void on_Button_pressed( GtkButton * button,gpointer user_data ) +static void on_Button_pressed(GtkButton *button, gpointer user_data) { - urlItem * item; + urlItem *item; - (void) button; + (void)button; - if ( (int)user_data ) - { - gchar * str= strdup( gtk_entry_get_text( GTK_ENTRY( URLEntry ) ) ); + if ((int)user_data) { + gchar *str = strdup(gtk_entry_get_text(GTK_ENTRY(URLEntry))); - if ( str ) - { - if ( !strstr( str,"://" ) ) - { - gchar * tmp; - tmp=malloc( strlen( str ) + 8 ); - sprintf( tmp,"http://%s",str ); - free( str ); str=tmp; - } - URLComboEntrys=g_list_prepend( URLComboEntrys,(gchar *)str ); + if (str) { + if (!strstr(str, "://")) { + gchar *tmp; + tmp = malloc(strlen(str) + 8); + sprintf(tmp, "http://%s", str); + free(str); + str = tmp; + } - item=calloc( 1,sizeof( urlItem ) ); - item->url=gstrdup( str ); - listMgr( URLLIST_ITEM_ADD,item ); + URLComboEntrys = g_list_prepend(URLComboEntrys, (gchar *)str); - uiSetFile( NULL,str,STREAMTYPE_STREAM ); guiInfo.NewPlay=GUI_FILE_NEW; - listMgr(PLAYLIST_DELETE, 0); - add_to_gui_playlist(str, PLAYLIST_ITEM_APPEND); - uiEvent( evPlay,0 ); + item = calloc(1, sizeof(urlItem)); + item->url = gstrdup(str); + listMgr(URLLIST_ITEM_ADD, item); + + uiSetFile(NULL, str, STREAMTYPE_STREAM); + guiInfo.NewPlay = GUI_FILE_NEW; + listMgr(PLAYLIST_DELETE, 0); + add_to_gui_playlist(str, PLAYLIST_ITEM_APPEND); + uiEvent(evPlay, 0); + } } - } - gtk_widget_destroy( URLDialog ); + + gtk_widget_destroy(URLDialog); } -static GtkWidget * CreateURLDialog( void ) +static GtkWidget *CreateURLDialog(void) { - GtkWidget * vbox1; - GtkWidget * hbox1; - GtkWidget * hbuttonbox1; - GtkWidget * Ok; - GtkWidget * Cancel; - GtkAccelGroup * accel_group; + GtkWidget *vbox1; + GtkWidget *hbox1; + GtkWidget *hbuttonbox1; + GtkWidget *Ok; + GtkWidget *Cancel; + GtkAccelGroup *accel_group; - accel_group=gtk_accel_group_new(); + accel_group = gtk_accel_group_new(); - URLDialog=gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_set_name( URLDialog,"URL" ); - gtk_object_set_data( GTK_OBJECT( URLDialog ),"URL",URLDialog ); - gtk_widget_set_usize( URLDialog,384,70 ); - GTK_WIDGET_SET_FLAGS( URLDialog,GTK_CAN_DEFAULT ); - gtk_window_set_title( GTK_WINDOW( URLDialog ),MSGTR_Network ); - gtk_window_set_position( GTK_WINDOW( URLDialog ),GTK_WIN_POS_CENTER ); - gtk_window_set_policy( GTK_WINDOW( URLDialog ),TRUE,TRUE,FALSE ); - gtk_window_set_wmclass( GTK_WINDOW( URLDialog ),"Network","MPlayer" ); + URLDialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_widget_set_name(URLDialog, "URL"); + gtk_object_set_data(GTK_OBJECT(URLDialog), "URL", URLDialog); + gtk_widget_set_usize(URLDialog, 384, 70); + GTK_WIDGET_SET_FLAGS(URLDialog, GTK_CAN_DEFAULT); + gtk_window_set_title(GTK_WINDOW(URLDialog), MSGTR_Network); + gtk_window_set_position(GTK_WINDOW(URLDialog), GTK_WIN_POS_CENTER); + gtk_window_set_policy(GTK_WINDOW(URLDialog), TRUE, TRUE, FALSE); + gtk_window_set_wmclass(GTK_WINDOW(URLDialog), "Network", "MPlayer"); - gtk_widget_realize( URLDialog ); - gtkAddIcon( URLDialog ); + gtk_widget_realize(URLDialog); + gtkAddIcon(URLDialog); - vbox1=AddVBox( AddDialogFrame( URLDialog ),0 ); - hbox1=AddHBox( vbox1,1 ); - AddLabel( "URL: ",hbox1 ); + vbox1 = AddVBox(AddDialogFrame(URLDialog), 0); + hbox1 = AddHBox(vbox1, 1); + AddLabel("URL: ", hbox1); - URLCombo=AddComboBox( hbox1 ); + URLCombo = AddComboBox(hbox1); /* - gtk_combo_new(); - gtk_widget_set_name( URLCombo,"URLCombo" ); - gtk_widget_show( URLCombo ); - gtk_box_pack_start( GTK_BOX( hbox1 ),URLCombo,TRUE,TRUE,0 ); -*/ - URLEntry=GTK_COMBO( URLCombo )->entry; - gtk_widget_set_name( URLEntry,"URLEntry" ); - gtk_widget_show( URLEntry ); + * gtk_combo_new(); + * gtk_widget_set_name( URLCombo,"URLCombo" ); + * gtk_widget_show( URLCombo ); + * gtk_box_pack_start( GTK_BOX( hbox1 ),URLCombo,TRUE,TRUE,0 ); + */ + URLEntry = GTK_COMBO(URLCombo)->entry; + gtk_widget_set_name(URLEntry, "URLEntry"); + gtk_widget_show(URLEntry); - AddHSeparator( vbox1 ); + AddHSeparator(vbox1); - hbuttonbox1=AddHButtonBox( vbox1 ); - gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox1 ),GTK_BUTTONBOX_END ); - gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox1 ),10 ); + hbuttonbox1 = AddHButtonBox(vbox1); + gtk_button_box_set_layout(GTK_BUTTON_BOX(hbuttonbox1), GTK_BUTTONBOX_END); + gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbuttonbox1), 10); - Ok=AddButton( MSGTR_Ok,hbuttonbox1 ); - Cancel=AddButton( MSGTR_Cancel,hbuttonbox1 ); + Ok = AddButton(MSGTR_Ok, hbuttonbox1); + Cancel = AddButton(MSGTR_Cancel, hbuttonbox1); - gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE ); - gtk_widget_add_accelerator( Cancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE ); + gtk_widget_add_accelerator(Ok, "clicked", accel_group, GDK_Return, 0, GTK_ACCEL_VISIBLE); + gtk_widget_add_accelerator(Cancel, "clicked", accel_group, GDK_Escape, 0, GTK_ACCEL_VISIBLE); - gtk_signal_connect( GTK_OBJECT( URLDialog ),"destroy",GTK_SIGNAL_FUNC( gtk_widget_destroyed ),&URLDialog ); - gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( on_Button_pressed ),(void *)1 ); - gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( on_Button_pressed ),NULL ); + gtk_signal_connect(GTK_OBJECT(URLDialog), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &URLDialog); + gtk_signal_connect(GTK_OBJECT(Ok), "clicked", GTK_SIGNAL_FUNC(on_Button_pressed), (void *)1); + gtk_signal_connect(GTK_OBJECT(Cancel), "clicked", GTK_SIGNAL_FUNC(on_Button_pressed), NULL); - gtk_widget_grab_focus( URLEntry ); - gtk_window_add_accel_group( GTK_WINDOW( URLDialog ),accel_group ); + gtk_widget_grab_focus(URLEntry); + gtk_window_add_accel_group(GTK_WINDOW(URLDialog), accel_group); - return URLDialog; + return URLDialog; } -void ShowURLDialog( void ) +void ShowURLDialog(void) { - urlItem * item; + urlItem *item; - if ( URLDialog ) gtkActive( URLDialog ); - else URLDialog=CreateURLDialog(); + if (URLDialog) + gtkActive(URLDialog); + else + URLDialog = CreateURLDialog(); - item = listMgr( URLLIST_GET,0 ); + item = listMgr(URLLIST_GET, 0); - if ( item ) - { - g_list_free( URLComboEntrys ); - URLComboEntrys=NULL; - while( item ) - { - URLComboEntrys=g_list_append( URLComboEntrys,(gchar *)item->url ); - item=item->next; + if (item) { + g_list_free(URLComboEntrys); + URLComboEntrys = NULL; + + while (item) { + URLComboEntrys = g_list_append(URLComboEntrys, (gchar *)item->url); + item = item->next; + } } - } - if ( URLComboEntrys ) - { - gtk_entry_set_text( GTK_ENTRY( URLEntry ),URLComboEntrys->data ); - gtk_combo_set_popdown_strings( GTK_COMBO( URLCombo ),URLComboEntrys ); - } + if (URLComboEntrys) { + gtk_entry_set_text(GTK_ENTRY(URLEntry), URLComboEntrys->data); + gtk_combo_set_popdown_strings(GTK_COMBO(URLCombo), URLComboEntrys); + } - gtk_widget_show( URLDialog ); + gtk_widget_show(URLDialog); } Modified: trunk/gui/dialog/url.h ============================================================================== --- trunk/gui/dialog/url.h Sun Mar 31 14:10:42 2013 (r36110) +++ trunk/gui/dialog/url.h Sun Mar 31 14:18:41 2013 (r36111) @@ -21,8 +21,8 @@ #include <gtk/gtk.h> -extern GtkWidget * URLDialog; +extern GtkWidget *URLDialog; -void ShowURLDialog( void ); +void ShowURLDialog(void); #endif /* MPLAYER_GUI_URL_H */

1 0

r36110 - trunk/gui/dialog/fileselect.c
by ib 31 Mar '13

31 Mar '13

Author: ib Date: Sun Mar 31 14:10:42 2013 New Revision: 36110 Log: Cosmetic: Rearrange code. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Sun Mar 31 05:57:53 2013 (r36109) +++ trunk/gui/dialog/fileselect.c Sun Mar 31 14:10:42 2013 (r36110) @@ -155,6 +155,31 @@ GdkPixmap *fpixmap; GdkBitmap *dmask; GdkBitmap *fmask; +static void fs_PersistantHistory(char *subject) +{ + unsigned int i; + char *entry; + + if (!subject) + return; + + for (i = 0; i < FF_ARRAY_ELEMS(fsHistory); i++) + if (gstrcmp(fsHistory[i], subject) == 0) { + entry = fsHistory[i]; + break; + } + + if (i == FF_ARRAY_ELEMS(fsHistory)) { + entry = strdup(subject); + free(fsHistory[--i]); + } + + for (; i; i--) + fsHistory[i] = fsHistory[i - 1]; + + fsHistory[0] = entry; +} + static gchar *get_current_dir_name_utf8(void) { char *dir; @@ -167,6 +192,27 @@ static gchar *get_current_dir_name_utf8( return utf8dir; } +static GList *fs_AddPath(GList *list, gpointer data, GtkPositionType pos) +{ + if (!g_list_find_custom(list, data, (GCompareFunc)strcmp)) { + if (pos == GTK_POS_TOP) + list = g_list_prepend(list, data); + else + list = g_list_append(list, data); + } + + return list; +} + +static void fs_AddPathUtf8(const char *name, GtkPositionType pos) +{ + gchar *utf8name; + + utf8name = g_filename_display_name(name); + fsTopList_items = fs_AddPath(fsTopList_items, utf8name, pos); + g_hash_table_insert(fsPathTable, strdup(utf8name), strdup(name)); +} + static void clist_append_fname(GtkWidget *list, char *fname, GdkPixmap *pixmap, GdkPixmap *mask) { @@ -251,63 +297,8 @@ static void CheckDir(GtkWidget *list) gtk_widget_show(list); } -static GList *fs_AddPath(GList *list, gpointer data, GtkPositionType pos) -{ - if (!g_list_find_custom(list, data, (GCompareFunc)strcmp)) { - if (pos == GTK_POS_TOP) - list = g_list_prepend(list, data); - else - list = g_list_append(list, data); - } - - return list; -} - -static void fs_AddPathUtf8(const char *name, GtkPositionType pos) -{ - gchar *utf8name; - - utf8name = g_filename_display_name(name); - fsTopList_items = fs_AddPath(fsTopList_items, utf8name, pos); - g_hash_table_insert(fsPathTable, strdup(utf8name), strdup(name)); -} - -static void fs_PersistantHistory(char *subject) -{ - unsigned int i; - char *entry; - - if (!subject) - return; - - for (i = 0; i < FF_ARRAY_ELEMS(fsHistory); i++) - if (gstrcmp(fsHistory[i], subject) == 0) { - entry = fsHistory[i]; - break; - } - - if (i == FF_ARRAY_ELEMS(fsHistory)) { - entry = strdup(subject); - free(fsHistory[--i]); - } - - for (; i; i--) - fsHistory[i] = fsHistory[i - 1]; - - fsHistory[0] = entry; -} - /* ----------------------------------------------- */ -static void fs_fsFilterCombo_activate(GtkEntry *entry, - gpointer user_data) -{ - (void)entry; - - fsFilter = gtk_entry_get_text(GTK_ENTRY(user_data)); - CheckDir(fsFNameList); -} - static void fs_fsFilterCombo_changed(GtkEditable *editable, gpointer user_data) { @@ -376,13 +367,22 @@ static void fs_fsFilterCombo_changed(Gtk CheckDir(fsFNameList); } -static void fs_fsPathCombo_activate(GtkEntry *entry, - gpointer user_data) +static void fs_fsFilterCombo_activate(GtkEntry *entry, + gpointer user_data) +{ + (void)entry; + + fsFilter = gtk_entry_get_text(GTK_ENTRY(user_data)); + CheckDir(fsFNameList); +} + +static void fs_fsPathCombo_changed(GtkEditable *editable, + gpointer user_data) { const unsigned char *str; gchar *dirname; - (void)entry; + (void)editable; str = gtk_entry_get_text(GTK_ENTRY(user_data)); dirname = g_hash_table_lookup(fsPathTable, str); @@ -391,13 +391,13 @@ static void fs_fsPathCombo_activate(GtkE CheckDir(fsFNameList); } -static void fs_fsPathCombo_changed(GtkEditable *editable, - gpointer user_data) +static void fs_fsPathCombo_activate(GtkEntry *entry, + gpointer user_data) { const unsigned char *str; gchar *dirname; - (void)editable; + (void)entry; str = gtk_entry_get_text(GTK_ENTRY(user_data)); dirname = g_hash_table_lookup(fsPathTable, str); @@ -406,6 +406,42 @@ static void fs_fsPathCombo_changed(GtkEd CheckDir(fsFNameList); } +static gboolean fs_fsFNameList_event(GtkWidget *widget, + GdkEvent *event, + gpointer user_data) +{ + GdkEventButton *bevent; + gint row, col; + + (void)user_data; + + bevent = (GdkEventButton *)event; + + if (event->type == GDK_BUTTON_RELEASE && bevent->button == 2) { + if (gtk_clist_get_selection_info(GTK_CLIST(widget), bevent->x, bevent->y, &row, &col)) { + fsSelectedFile = gtk_clist_get_row_data(GTK_CLIST(widget), row); + gtk_button_released(GTK_BUTTON(fsOk)); + + return TRUE; + } + } + + return FALSE; +} + +static void fs_fsFNameList_select_row(GtkCList *clist, gint row, gint column, + GdkEvent *event, gpointer user_data) +{ + (void)column; + (void)user_data; + + fsCurrFNameListSelected = row; + fsSelectedFile = gtk_clist_get_row_data(clist, row); + + if (event && event->type == GDK_BUTTON_PRESS) + gtk_button_released(GTK_BUTTON(fsOk)); +} + static void fs_Up_released(GtkButton *button, gpointer user_data) { gchar *utf8dir; @@ -514,19 +550,6 @@ static void fs_Ok_released(GtkButton *bu gui(GUI_SET_STATE, (void *)GUI_STOP); } -static void fs_fsFNameList_select_row(GtkCList *clist, gint row, gint column, - GdkEvent *event, gpointer user_data) -{ - (void)column; - (void)user_data; - - fsCurrFNameListSelected = row; - fsSelectedFile = gtk_clist_get_row_data(clist, row); - - if (event && event->type == GDK_BUTTON_PRESS) - gtk_button_released(GTK_BUTTON(fsOk)); -} - static gboolean on_FileSelect_key_release_event(GtkWidget *widget, GdkEvent *event, gpointer user_data) @@ -556,29 +579,6 @@ static gboolean on_FileSelect_key_releas return FALSE; } -static gboolean fs_fsFNameList_event(GtkWidget *widget, - GdkEvent *event, - gpointer user_data) -{ - GdkEventButton *bevent; - gint row, col; - - (void)user_data; - - bevent = (GdkEventButton *)event; - - if (event->type == GDK_BUTTON_RELEASE && bevent->button == 2) { - if (gtk_clist_get_selection_info(GTK_CLIST(widget), bevent->x, bevent->y, &row, &col)) { - fsSelectedFile = gtk_clist_get_row_data(GTK_CLIST(widget), row); - gtk_button_released(GTK_BUTTON(fsOk)); - - return TRUE; - } - } - - return FALSE; -} - static void fs_Destroy(void) { gtk_widget_destroyed(FileSelector, &FileSelector);

1 0