From 9e1391b5344ec30267260bab51dcf9a41af1d2e1 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 5 Mar 2008 07:59:37 +0000 Subject: Rename url.c/url.h to the less generic gtk_url.c/gtk_url.h. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26169 b3059339-0415-0410-9bf9-f77b7e298cf2 --- gui/Makefile | 2 +- gui/mplayer/gtk/gtk_url.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++ gui/mplayer/gtk/gtk_url.h | 12 ++++ gui/mplayer/gtk/url.c | 154 ---------------------------------------------- gui/mplayer/gtk/url.h | 12 ---- gui/mplayer/widgets.c | 2 +- 6 files changed, 168 insertions(+), 168 deletions(-) create mode 100644 gui/mplayer/gtk/gtk_url.c create mode 100644 gui/mplayer/gtk/gtk_url.h delete mode 100644 gui/mplayer/gtk/url.c delete mode 100644 gui/mplayer/gtk/url.h (limited to 'gui') diff --git a/gui/Makefile b/gui/Makefile index b2d67a334b..777fa031d0 100644 --- a/gui/Makefile +++ b/gui/Makefile @@ -31,12 +31,12 @@ SRCS_MPLAYER = app.c \ mplayer/gtk/eq.c \ mplayer/gtk/fs.c \ mplayer/gtk/gtk_common.c \ + mplayer/gtk/gtk_url.c \ mplayer/gtk/mb.c \ mplayer/gtk/menu.c \ mplayer/gtk/opts.c \ mplayer/gtk/pl.c \ mplayer/gtk/sb.c \ - mplayer/gtk/url.c \ skin/cut.c \ skin/font.c \ skin/skin.c \ diff --git a/gui/mplayer/gtk/gtk_url.c b/gui/mplayer/gtk/gtk_url.c new file mode 100644 index 0000000000..1ce9a315e8 --- /dev/null +++ b/gui/mplayer/gtk/gtk_url.c @@ -0,0 +1,154 @@ + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "gtk_url.h" +#include "gtk_common.h" +#include "interface.h" +#include "app.h" +#include "../widgets.h" +#include "../gmplayer.h" +#include "help_mp.h" + +GtkWidget * URL = NULL; + +static GtkWidget * URLCombo; +static GtkWidget * URLEntry; +static GList * URLComboEntrys = NULL; + +void ShowURLDialogBox( void ) +{ + if ( URL ) gtkActive( URL ); + else URL=create_URL(); + + if ( URLList ) + { + URLItem * item = URLList; + 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 ); + } + + gtk_widget_show( URL ); +} + +void HideURLDialogBox( void ) +{ + if ( !URL ) return; + gtk_widget_hide( URL ); + gtk_widget_destroy( URL ); + URL=0; +} + +static void on_Button_pressed( GtkButton * button,gpointer user_data ) +{ + URLItem * item; + + if ( (int)user_data ) + { + gchar * str= strdup( gtk_entry_get_text( GTK_ENTRY( URLEntry ) ) ); + + if ( str ) + { + if ( strncmp( str,"http://",7 ) + && strncmp( str,"ftp://",6 ) + && strncmp( str,"mms://",6 ) + && strncmp( str,"pnm://",6 ) + && strncmp( str,"rtsp://",7 ) ) + { + gchar * tmp; + tmp=malloc( strlen( str ) + 8 ); + sprintf( tmp,"http://%s",str ); + free( str ); str=tmp; + } + URLComboEntrys=g_list_prepend( URLComboEntrys,(gchar *)str ); + + item=calloc( 1,sizeof( URLItem ) ); + item->url=gstrdup( str ); + gtkSet( gtkAddURLItem,0,(void *)item ); + + guiSetFilename( guiIntfStruct.Filename,str ); guiIntfStruct.FilenameChanged=1; + mplEventHandling( evPlayNetwork,0 ); + } + } + HideURLDialogBox(); +} + +GtkWidget * create_URL( void ) +{ + GtkWidget * vbox1; + GtkWidget * hbox1; + GtkWidget * hbuttonbox1; + GtkWidget * Ok; + GtkWidget * Cancel; + GtkAccelGroup * accel_group; + + accel_group=gtk_accel_group_new(); + + URL=gtk_window_new( GTK_WINDOW_TOPLEVEL ); + gtk_widget_set_name( URL,"URL" ); + gtk_object_set_data( GTK_OBJECT( URL ),"URL",URL ); + gtk_widget_set_usize( URL,384,70 ); + GTK_WIDGET_SET_FLAGS( URL,GTK_CAN_DEFAULT ); + gtk_window_set_title( GTK_WINDOW( URL ),MSGTR_Network ); + gtk_window_set_position( GTK_WINDOW( URL ),GTK_WIN_POS_CENTER ); + gtk_window_set_policy( GTK_WINDOW( URL ),TRUE,TRUE,FALSE ); + gtk_window_set_wmclass( GTK_WINDOW( URL ),"Network","MPlayer" ); + + gtk_widget_realize( URL ); + gtkAddIcon( URL ); + + vbox1=AddVBox( AddDialogFrame( URL ),0 ); + hbox1=AddHBox( vbox1,1 ); + AddLabel( "URL: ",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 ); + + 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 ); + + 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_signal_connect( GTK_OBJECT( URL ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&URL ); + 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( URL ),accel_group ); + + return URL; +} + diff --git a/gui/mplayer/gtk/gtk_url.h b/gui/mplayer/gtk/gtk_url.h new file mode 100644 index 0000000000..9e0284a832 --- /dev/null +++ b/gui/mplayer/gtk/gtk_url.h @@ -0,0 +1,12 @@ +#ifndef MPLAYER_GUI_GTK_URL_H +#define MPLAYER_GUI_GTK_URL_H + +#include + +extern GtkWidget * URL; +extern int gtkVURLDialogBox; + +extern void ShowURLDialogBox( void ); +extern GtkWidget * create_URL( void ); + +#endif /* MPLAYER_GUI_GTK_URL_H */ diff --git a/gui/mplayer/gtk/url.c b/gui/mplayer/gtk/url.c deleted file mode 100644 index c4809e8d13..0000000000 --- a/gui/mplayer/gtk/url.c +++ /dev/null @@ -1,154 +0,0 @@ - -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "url.h" -#include "gtk_common.h" -#include "interface.h" -#include "app.h" -#include "../widgets.h" -#include "../gmplayer.h" -#include "help_mp.h" - -GtkWidget * URL = NULL; - -static GtkWidget * URLCombo; -static GtkWidget * URLEntry; -static GList * URLComboEntrys = NULL; - -void ShowURLDialogBox( void ) -{ - if ( URL ) gtkActive( URL ); - else URL=create_URL(); - - if ( URLList ) - { - URLItem * item = URLList; - 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 ); - } - - gtk_widget_show( URL ); -} - -void HideURLDialogBox( void ) -{ - if ( !URL ) return; - gtk_widget_hide( URL ); - gtk_widget_destroy( URL ); - URL=0; -} - -static void on_Button_pressed( GtkButton * button,gpointer user_data ) -{ - URLItem * item; - - if ( (int)user_data ) - { - gchar * str= strdup( gtk_entry_get_text( GTK_ENTRY( URLEntry ) ) ); - - if ( str ) - { - if ( strncmp( str,"http://",7 ) - && strncmp( str,"ftp://",6 ) - && strncmp( str,"mms://",6 ) - && strncmp( str,"pnm://",6 ) - && strncmp( str,"rtsp://",7 ) ) - { - gchar * tmp; - tmp=malloc( strlen( str ) + 8 ); - sprintf( tmp,"http://%s",str ); - free( str ); str=tmp; - } - URLComboEntrys=g_list_prepend( URLComboEntrys,(gchar *)str ); - - item=calloc( 1,sizeof( URLItem ) ); - item->url=gstrdup( str ); - gtkSet( gtkAddURLItem,0,(void *)item ); - - guiSetFilename( guiIntfStruct.Filename,str ); guiIntfStruct.FilenameChanged=1; - mplEventHandling( evPlayNetwork,0 ); - } - } - HideURLDialogBox(); -} - -GtkWidget * create_URL( void ) -{ - GtkWidget * vbox1; - GtkWidget * hbox1; - GtkWidget * hbuttonbox1; - GtkWidget * Ok; - GtkWidget * Cancel; - GtkAccelGroup * accel_group; - - accel_group=gtk_accel_group_new(); - - URL=gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_set_name( URL,"URL" ); - gtk_object_set_data( GTK_OBJECT( URL ),"URL",URL ); - gtk_widget_set_usize( URL,384,70 ); - GTK_WIDGET_SET_FLAGS( URL,GTK_CAN_DEFAULT ); - gtk_window_set_title( GTK_WINDOW( URL ),MSGTR_Network ); - gtk_window_set_position( GTK_WINDOW( URL ),GTK_WIN_POS_CENTER ); - gtk_window_set_policy( GTK_WINDOW( URL ),TRUE,TRUE,FALSE ); - gtk_window_set_wmclass( GTK_WINDOW( URL ),"Network","MPlayer" ); - - gtk_widget_realize( URL ); - gtkAddIcon( URL ); - - vbox1=AddVBox( AddDialogFrame( URL ),0 ); - hbox1=AddHBox( vbox1,1 ); - AddLabel( "URL: ",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 ); - - 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 ); - - 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_signal_connect( GTK_OBJECT( URL ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&URL ); - 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( URL ),accel_group ); - - return URL; -} - diff --git a/gui/mplayer/gtk/url.h b/gui/mplayer/gtk/url.h deleted file mode 100644 index c29895d889..0000000000 --- a/gui/mplayer/gtk/url.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef MPLAYER_GUI_URL_H -#define MPLAYER_GUI_URL_H - -#include - -extern GtkWidget * URL; -extern int gtkVURLDialogBox; - -extern void ShowURLDialogBox( void ); -extern GtkWidget * create_URL( void ); - -#endif /* MPLAYER_GUI_URL_H */ diff --git a/gui/mplayer/widgets.c b/gui/mplayer/widgets.c index 891b44b32f..3595966223 100644 --- a/gui/mplayer/widgets.c +++ b/gui/mplayer/widgets.c @@ -44,7 +44,7 @@ int gtkInitialized = 0; #include "gtk/about.h" #include "gtk/opts.h" #include "gtk/menu.h" -#include "gtk/url.h" +#include "gtk/gtk_url.h" #include "gtk/eq.h" #include "pixmaps/MPlayer_mini.xpm" -- cgit v1.2.3