From d64cf433158588a377421c7a90e4c0169b4841f8 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 6 Jan 2008 16:22:00 +0000 Subject: Rename common.[ch] to gtk_common.[ch], there are too many files by that name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25629 b3059339-0415-0410-9bf9-f77b7e298cf2 --- gui/Makefile | 2 +- gui/mplayer/gtk/about.c | 2 +- gui/mplayer/gtk/common.c | 180 ------------------------------------------- gui/mplayer/gtk/common.h | 24 ------ gui/mplayer/gtk/eq.c | 2 +- gui/mplayer/gtk/fs.c | 2 +- gui/mplayer/gtk/gtk_common.c | 180 +++++++++++++++++++++++++++++++++++++++++++ gui/mplayer/gtk/gtk_common.h | 24 ++++++ gui/mplayer/gtk/mb.c | 2 +- gui/mplayer/gtk/opts.c | 2 +- gui/mplayer/gtk/pl.c | 2 +- gui/mplayer/gtk/sb.c | 2 +- gui/mplayer/gtk/url.c | 2 +- 13 files changed, 213 insertions(+), 213 deletions(-) delete mode 100644 gui/mplayer/gtk/common.c delete mode 100644 gui/mplayer/gtk/common.h create mode 100644 gui/mplayer/gtk/gtk_common.c create mode 100644 gui/mplayer/gtk/gtk_common.h (limited to 'gui') diff --git a/gui/Makefile b/gui/Makefile index 28c806a0cb..76c938991f 100644 --- a/gui/Makefile +++ b/gui/Makefile @@ -41,7 +41,7 @@ SRCS_MPLAYER = wm/ws.c \ mplayer/gtk/opts.c \ mplayer/gtk/url.c \ mplayer/gtk/eq.c \ - mplayer/gtk/common.c \ + mplayer/gtk/gtk_common.c \ endif diff --git a/gui/mplayer/gtk/about.c b/gui/mplayer/gtk/about.c index a19bb55065..47a2b993df 100644 --- a/gui/mplayer/gtk/about.c +++ b/gui/mplayer/gtk/about.c @@ -6,7 +6,7 @@ #include "mplayer/pixmaps/about.xpm" #include "../widgets.h" #include "about.h" -#include "common.h" +#include "gtk_common.h" GtkWidget * About = NULL; diff --git a/gui/mplayer/gtk/common.c b/gui/mplayer/gtk/common.c deleted file mode 100644 index 7a21969e2f..0000000000 --- a/gui/mplayer/gtk/common.c +++ /dev/null @@ -1,180 +0,0 @@ - -#include -#include - -#include "common.h" - -void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer ) -{ - if ( !widget_pointer ) return; - gtk_widget_hide( *widget_pointer ); - gtk_widget_destroy( *widget_pointer ); - *widget_pointer=NULL; -} - -GtkWidget * AddDialogFrame( GtkWidget * parent ) -{ - GtkWidget * frame; - frame=AddFrame( 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 ); - return frame; -} - -GtkWidget * AddFrame( const char * title,int type,GtkWidget * parent,int add ) -{ - GtkWidget * frame = NULL; - frame=gtk_frame_new( title ); - gtk_widget_set_name( frame,"frame" ); - gtk_widget_show( frame ); - gtk_frame_set_shadow_type( GTK_FRAME( frame ),type ); - if ( !parent ) return frame; - if ( add ) gtk_container_add( GTK_CONTAINER( parent ),frame ); - else gtk_box_pack_start( GTK_BOX( parent ),frame,FALSE,FALSE,0 ); - return frame; -} - -GtkWidget * AddLabel( const char * title,GtkWidget * parent ) -{ - GtkWidget * label; - label=gtk_label_new( title ); - gtk_widget_set_name( label,"label" ); - gtk_widget_show( label ); - if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),label,FALSE,FALSE,0 ); - gtk_misc_set_alignment( GTK_MISC( label ),0,0.5 ); - gtk_misc_set_padding( GTK_MISC( label ),4,0 ); - return label; -} - -GtkWidget * AddVBox( GtkWidget * parent,int type ) -{ - GtkWidget * vbox; - vbox=gtk_vbox_new( FALSE,0 ); - gtk_widget_set_name( vbox,"vbox" ); - gtk_widget_show( vbox ); - if ( parent ) - { - if ( type ) gtk_box_pack_start( GTK_BOX( parent ),vbox,FALSE,FALSE,0 ); - else gtk_container_add( GTK_CONTAINER( parent ),vbox ); - } - return vbox; -} - -GtkWidget * AddHBox( GtkWidget * parent,int type ) -{ - GtkWidget * hbox; - hbox=gtk_hbox_new( FALSE,0 ); - gtk_widget_set_name( hbox,"hbox" ); - gtk_widget_show( hbox ); - if ( parent ) - { - if ( type ) gtk_box_pack_start( GTK_BOX( parent ),hbox,FALSE,FALSE,0 ); - else gtk_container_add( GTK_CONTAINER( parent ),hbox ); - } - return hbox; -} - -GtkWidget * AddCheckButton( const char * title, GtkWidget * parent ) -{ - GtkWidget * CB; - CB=gtk_check_button_new_with_label( title ); - gtk_widget_set_name( CB,"CB" ); - gtk_widget_show( CB ); - gtk_box_pack_start( GTK_BOX( parent ),CB,FALSE,FALSE,0 ); - return CB; -} - -GtkWidget * AddRadioButton( const char * title,GSList ** group,GtkWidget * parent ) -{ - GtkWidget * RB; - RB=gtk_radio_button_new_with_label( *group,title ); - *group=gtk_radio_button_group( GTK_RADIO_BUTTON( RB ) ); - gtk_widget_set_name( RB,"RB" ); - gtk_widget_show( RB ); - gtk_box_pack_start( GTK_BOX( parent ),RB,FALSE,FALSE,0 ); - return RB; -} - -GtkWidget * AddSpinButton( const char * title,GtkAdjustment * adj,GtkWidget * parent ) -{ - GtkWidget * SB; - GtkWidget * label; - label=gtk_label_new( title ); - gtk_misc_set_alignment( GTK_MISC( label ),0,0.5 ); - gtk_box_pack_start( GTK_BOX( parent ),label,FALSE,FALSE,0 ); - gtk_widget_show( label ); - SB=gtk_spin_button_new( adj,0,0 ); - gtk_widget_set_name( SB,"SB" ); - gtk_box_pack_start( GTK_BOX( parent ),SB,FALSE,FALSE,0 ); - gtk_widget_show( SB ); - return SB; -} - -GtkWidget * AddButton( const char * title,GtkWidget * parent ) -{ - GtkWidget * B; - B=gtk_button_new_with_label( title ); - gtk_widget_set_name( B,"B" ); - gtk_widget_show( B ); - gtk_container_add( GTK_CONTAINER( parent ),B ); - return B; -} - -GtkWidget * AddHSeparator( GtkWidget * parent ) -{ - GtkWidget * hseparator; - hseparator=gtk_hseparator_new(); - gtk_widget_set_name( hseparator,"hseparator1" ); - gtk_widget_show( hseparator ); - gtk_box_pack_start( GTK_BOX( parent ),hseparator,FALSE,FALSE,0 ); - gtk_widget_set_usize( hseparator,-2,6 ); - return hseparator; -} - -GtkWidget * AddHButtonBox( GtkWidget * parent ) -{ - GtkWidget * hbuttonbox; - hbuttonbox=gtk_hbutton_box_new(); - gtk_widget_set_name( hbuttonbox,"hbuttonbox" ); - gtk_widget_show( hbuttonbox ); - gtk_box_pack_start( GTK_BOX( parent ),hbuttonbox,FALSE,FALSE,0 ); - gtk_button_box_set_child_size( GTK_BUTTON_BOX( hbuttonbox ),85,20 ); - return hbuttonbox; -} - -GtkWidget * AddHScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ) -{ - GtkWidget * HS; - HS=gtk_hscale_new( adj ); - gtk_widget_set_name( HS,"HS" ); - gtk_widget_show( HS ); - if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),HS,TRUE,TRUE,0 ); - gtk_scale_set_value_pos( GTK_SCALE( HS ),GTK_POS_RIGHT ); - gtk_scale_set_digits( GTK_SCALE( HS ),digit ); - return HS; -} - -GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ) -{ - GtkWidget * VS; - VS=gtk_vscale_new( adj ); - gtk_widget_set_name( VS,"VS" ); - gtk_widget_show( VS ); - if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),VS,TRUE,TRUE,0 ); -// gtk_scale_set_value_pos( GTK_SCALE( VS ),GTK_POS_RIGHT ); - if ( digit == -1 ) gtk_scale_set_draw_value( GTK_SCALE( VS ),FALSE ); - else gtk_scale_set_digits( GTK_SCALE( VS ),digit ); - return VS; -} - -GtkWidget * AddComboBox( GtkWidget * parent ) -{ - GtkWidget * CB; - CB=gtk_combo_new(); - gtk_widget_set_name( CB,"CB" ); - gtk_widget_show( CB ); - if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),CB,TRUE,TRUE,0 ); - return CB; -} diff --git a/gui/mplayer/gtk/common.h b/gui/mplayer/gtk/common.h deleted file mode 100644 index f96b9d2bb5..0000000000 --- a/gui/mplayer/gtk/common.h +++ /dev/null @@ -1,24 +0,0 @@ - -#ifndef GUI_COMMON_H -#define GUI_COMMON_H - -#include -#include - -extern GtkWidget * AddDialogFrame( GtkWidget * parent ); -extern GtkWidget * AddFrame( const char * title,int type,GtkWidget * parent,int add ); -extern GtkWidget * AddLabel( const char * title,GtkWidget * parent ); -extern GtkWidget * AddVBox( GtkWidget * parent,int type ); -extern GtkWidget * AddHBox( GtkWidget * parent,int type ); -extern GtkWidget * AddCheckButton( const char * title, GtkWidget * parent ); -extern GtkWidget * AddRadioButton( const char * title,GSList ** group,GtkWidget * parent ); -extern GtkWidget * AddSpinButton( const char * title,GtkAdjustment * adj,GtkWidget * parent ); -extern GtkWidget * AddButton( const char * title,GtkWidget * parent ); -extern GtkWidget * AddHSeparator( GtkWidget * parent ); -extern GtkWidget * AddHButtonBox( GtkWidget * parent ); -extern GtkWidget * AddHScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ); -extern GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ); -extern GtkWidget * AddComboBox( GtkWidget * parent ); -extern void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer ); - -#endif /* GUI_COMMON_H */ diff --git a/gui/mplayer/gtk/eq.c b/gui/mplayer/gtk/eq.c index 1e19fcf0f2..57901e86d0 100644 --- a/gui/mplayer/gtk/eq.c +++ b/gui/mplayer/gtk/eq.c @@ -22,7 +22,7 @@ #include "../widgets.h" #include "eq.h" -#include "common.h" +#include "gtk_common.h" #define eqRange 15 diff --git a/gui/mplayer/gtk/fs.c b/gui/mplayer/gtk/fs.c index 5a45a13b29..62191cade4 100644 --- a/gui/mplayer/gtk/fs.c +++ b/gui/mplayer/gtk/fs.c @@ -21,7 +21,7 @@ #include "../widgets.h" #include "fs.h" #include "opts.h" -#include "common.h" +#include "gtk_common.h" #ifndef __linux__ #define get_current_dir_name() getcwd(NULL, PATH_MAX) diff --git a/gui/mplayer/gtk/gtk_common.c b/gui/mplayer/gtk/gtk_common.c new file mode 100644 index 0000000000..de7b4487d7 --- /dev/null +++ b/gui/mplayer/gtk/gtk_common.c @@ -0,0 +1,180 @@ + +#include +#include + +#include "gtk_common.h" + +void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer ) +{ + if ( !widget_pointer ) return; + gtk_widget_hide( *widget_pointer ); + gtk_widget_destroy( *widget_pointer ); + *widget_pointer=NULL; +} + +GtkWidget * AddDialogFrame( GtkWidget * parent ) +{ + GtkWidget * frame; + frame=AddFrame( 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 ); + return frame; +} + +GtkWidget * AddFrame( const char * title,int type,GtkWidget * parent,int add ) +{ + GtkWidget * frame = NULL; + frame=gtk_frame_new( title ); + gtk_widget_set_name( frame,"frame" ); + gtk_widget_show( frame ); + gtk_frame_set_shadow_type( GTK_FRAME( frame ),type ); + if ( !parent ) return frame; + if ( add ) gtk_container_add( GTK_CONTAINER( parent ),frame ); + else gtk_box_pack_start( GTK_BOX( parent ),frame,FALSE,FALSE,0 ); + return frame; +} + +GtkWidget * AddLabel( const char * title,GtkWidget * parent ) +{ + GtkWidget * label; + label=gtk_label_new( title ); + gtk_widget_set_name( label,"label" ); + gtk_widget_show( label ); + if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),label,FALSE,FALSE,0 ); + gtk_misc_set_alignment( GTK_MISC( label ),0,0.5 ); + gtk_misc_set_padding( GTK_MISC( label ),4,0 ); + return label; +} + +GtkWidget * AddVBox( GtkWidget * parent,int type ) +{ + GtkWidget * vbox; + vbox=gtk_vbox_new( FALSE,0 ); + gtk_widget_set_name( vbox,"vbox" ); + gtk_widget_show( vbox ); + if ( parent ) + { + if ( type ) gtk_box_pack_start( GTK_BOX( parent ),vbox,FALSE,FALSE,0 ); + else gtk_container_add( GTK_CONTAINER( parent ),vbox ); + } + return vbox; +} + +GtkWidget * AddHBox( GtkWidget * parent,int type ) +{ + GtkWidget * hbox; + hbox=gtk_hbox_new( FALSE,0 ); + gtk_widget_set_name( hbox,"hbox" ); + gtk_widget_show( hbox ); + if ( parent ) + { + if ( type ) gtk_box_pack_start( GTK_BOX( parent ),hbox,FALSE,FALSE,0 ); + else gtk_container_add( GTK_CONTAINER( parent ),hbox ); + } + return hbox; +} + +GtkWidget * AddCheckButton( const char * title, GtkWidget * parent ) +{ + GtkWidget * CB; + CB=gtk_check_button_new_with_label( title ); + gtk_widget_set_name( CB,"CB" ); + gtk_widget_show( CB ); + gtk_box_pack_start( GTK_BOX( parent ),CB,FALSE,FALSE,0 ); + return CB; +} + +GtkWidget * AddRadioButton( const char * title,GSList ** group,GtkWidget * parent ) +{ + GtkWidget * RB; + RB=gtk_radio_button_new_with_label( *group,title ); + *group=gtk_radio_button_group( GTK_RADIO_BUTTON( RB ) ); + gtk_widget_set_name( RB,"RB" ); + gtk_widget_show( RB ); + gtk_box_pack_start( GTK_BOX( parent ),RB,FALSE,FALSE,0 ); + return RB; +} + +GtkWidget * AddSpinButton( const char * title,GtkAdjustment * adj,GtkWidget * parent ) +{ + GtkWidget * SB; + GtkWidget * label; + label=gtk_label_new( title ); + gtk_misc_set_alignment( GTK_MISC( label ),0,0.5 ); + gtk_box_pack_start( GTK_BOX( parent ),label,FALSE,FALSE,0 ); + gtk_widget_show( label ); + SB=gtk_spin_button_new( adj,0,0 ); + gtk_widget_set_name( SB,"SB" ); + gtk_box_pack_start( GTK_BOX( parent ),SB,FALSE,FALSE,0 ); + gtk_widget_show( SB ); + return SB; +} + +GtkWidget * AddButton( const char * title,GtkWidget * parent ) +{ + GtkWidget * B; + B=gtk_button_new_with_label( title ); + gtk_widget_set_name( B,"B" ); + gtk_widget_show( B ); + gtk_container_add( GTK_CONTAINER( parent ),B ); + return B; +} + +GtkWidget * AddHSeparator( GtkWidget * parent ) +{ + GtkWidget * hseparator; + hseparator=gtk_hseparator_new(); + gtk_widget_set_name( hseparator,"hseparator1" ); + gtk_widget_show( hseparator ); + gtk_box_pack_start( GTK_BOX( parent ),hseparator,FALSE,FALSE,0 ); + gtk_widget_set_usize( hseparator,-2,6 ); + return hseparator; +} + +GtkWidget * AddHButtonBox( GtkWidget * parent ) +{ + GtkWidget * hbuttonbox; + hbuttonbox=gtk_hbutton_box_new(); + gtk_widget_set_name( hbuttonbox,"hbuttonbox" ); + gtk_widget_show( hbuttonbox ); + gtk_box_pack_start( GTK_BOX( parent ),hbuttonbox,FALSE,FALSE,0 ); + gtk_button_box_set_child_size( GTK_BUTTON_BOX( hbuttonbox ),85,20 ); + return hbuttonbox; +} + +GtkWidget * AddHScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ) +{ + GtkWidget * HS; + HS=gtk_hscale_new( adj ); + gtk_widget_set_name( HS,"HS" ); + gtk_widget_show( HS ); + if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),HS,TRUE,TRUE,0 ); + gtk_scale_set_value_pos( GTK_SCALE( HS ),GTK_POS_RIGHT ); + gtk_scale_set_digits( GTK_SCALE( HS ),digit ); + return HS; +} + +GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ) +{ + GtkWidget * VS; + VS=gtk_vscale_new( adj ); + gtk_widget_set_name( VS,"VS" ); + gtk_widget_show( VS ); + if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),VS,TRUE,TRUE,0 ); +// gtk_scale_set_value_pos( GTK_SCALE( VS ),GTK_POS_RIGHT ); + if ( digit == -1 ) gtk_scale_set_draw_value( GTK_SCALE( VS ),FALSE ); + else gtk_scale_set_digits( GTK_SCALE( VS ),digit ); + return VS; +} + +GtkWidget * AddComboBox( GtkWidget * parent ) +{ + GtkWidget * CB; + CB=gtk_combo_new(); + gtk_widget_set_name( CB,"CB" ); + gtk_widget_show( CB ); + if ( parent ) gtk_box_pack_start( GTK_BOX( parent ),CB,TRUE,TRUE,0 ); + return CB; +} diff --git a/gui/mplayer/gtk/gtk_common.h b/gui/mplayer/gtk/gtk_common.h new file mode 100644 index 0000000000..f96b9d2bb5 --- /dev/null +++ b/gui/mplayer/gtk/gtk_common.h @@ -0,0 +1,24 @@ + +#ifndef GUI_COMMON_H +#define GUI_COMMON_H + +#include +#include + +extern GtkWidget * AddDialogFrame( GtkWidget * parent ); +extern GtkWidget * AddFrame( const char * title,int type,GtkWidget * parent,int add ); +extern GtkWidget * AddLabel( const char * title,GtkWidget * parent ); +extern GtkWidget * AddVBox( GtkWidget * parent,int type ); +extern GtkWidget * AddHBox( GtkWidget * parent,int type ); +extern GtkWidget * AddCheckButton( const char * title, GtkWidget * parent ); +extern GtkWidget * AddRadioButton( const char * title,GSList ** group,GtkWidget * parent ); +extern GtkWidget * AddSpinButton( const char * title,GtkAdjustment * adj,GtkWidget * parent ); +extern GtkWidget * AddButton( const char * title,GtkWidget * parent ); +extern GtkWidget * AddHSeparator( GtkWidget * parent ); +extern GtkWidget * AddHButtonBox( GtkWidget * parent ); +extern GtkWidget * AddHScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ); +extern GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit ); +extern GtkWidget * AddComboBox( GtkWidget * parent ); +extern void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer ); + +#endif /* GUI_COMMON_H */ diff --git a/gui/mplayer/gtk/mb.c b/gui/mplayer/gtk/mb.c index 5f3873d054..db2ec24749 100644 --- a/gui/mplayer/gtk/mb.c +++ b/gui/mplayer/gtk/mb.c @@ -8,7 +8,7 @@ #include "../widgets.h" #include "mb.h" -#include "common.h" +#include "gtk_common.h" GtkWidget * gtkMessageBoxText; GtkWidget * MessageBox = NULL; diff --git a/gui/mplayer/gtk/opts.c b/gui/mplayer/gtk/opts.c index ffd79fd2fd..234245c908 100644 --- a/gui/mplayer/gtk/opts.c +++ b/gui/mplayer/gtk/opts.c @@ -25,7 +25,7 @@ #include "../widgets.h" #include "opts.h" #include "fs.h" -#include "common.h" +#include "gtk_common.h" // for mpcodecs_[av]d_drivers: #include "libmpcodecs/vd.h" diff --git a/gui/mplayer/gtk/pl.c b/gui/mplayer/gtk/pl.c index 8ca2f1e3fa..1e5b81eb6f 100644 --- a/gui/mplayer/gtk/pl.c +++ b/gui/mplayer/gtk/pl.c @@ -17,7 +17,7 @@ #include "interface.h" #include "../widgets.h" #include "pl.h" -#include "common.h" +#include "gtk_common.h" static char * book_open_xpm[] = { "16 16 4 1", diff --git a/gui/mplayer/gtk/sb.c b/gui/mplayer/gtk/sb.c index bae48c523f..d5e3e4bb20 100644 --- a/gui/mplayer/gtk/sb.c +++ b/gui/mplayer/gtk/sb.c @@ -7,7 +7,7 @@ #include #include "sb.h" -#include "common.h" +#include "gtk_common.h" #include "app.h" #include "config.h" diff --git a/gui/mplayer/gtk/url.c b/gui/mplayer/gtk/url.c index 591923f6f2..c4809e8d13 100644 --- a/gui/mplayer/gtk/url.c +++ b/gui/mplayer/gtk/url.c @@ -10,7 +10,7 @@ #include #include "url.h" -#include "common.h" +#include "gtk_common.h" #include "interface.h" #include "app.h" #include "../widgets.h" -- cgit v1.2.3