Skip to content

V
vlc-1.1
Commit 30b91066 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Working on functionality.

parent 368b29b1
Hide whitespace changes
Inline Side-by-side
Showing with 272 additions and 97 deletions
plugins/familiar/familiar.c
View file @ 30b91066
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* familiar.c : familiar plugin for vlc * familiar.c : familiar plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: familiar.c,v 1.5 2002/07/23 18:39:29 jpsaman Exp $ * $Id: familiar.c,v 1.6 2002/07/24 20:46:08 jpsaman Exp $
* *
* Authors: Jean-Paul Saman <jpsaman@wxs.nl> * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
* *
...@@ -199,6 +199,11 @@ static void intf_Run( intf_thread_t *p_intf ) ...@@ -199,6 +199,11 @@ static void intf_Run( intf_thread_t *p_intf )
gtk_window_set_title( GTK_WINDOW(p_intf->p_sys->p_window), gtk_window_set_title( GTK_WINDOW(p_intf->p_sys->p_window),
VOUT_TITLE " (Familiar Linux interface)"); VOUT_TITLE " (Familiar Linux interface)");
/* Get the slider object */
p_intf->p_sys->p_notebook = GTK_NOTEBOOK( gtk_object_get_data(
GTK_OBJECT( p_intf->p_sys->p_window ), "notebook" ) );
// gtk_widget_hide( GTK_WIDGET(p_intf->p_sys->p_notebook) );
/* Store p_intf to keep an eye on it */ /* Store p_intf to keep an eye on it */
gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window), gtk_object_set_data( GTK_OBJECT(p_intf->p_sys->p_window),
"p_intf", p_intf ); "p_intf", p_intf );
......
plugins/familiar/familiar.glade
View file @ 30b91066
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
<language>C</language> <language>C</language>
<gnome_support>False</gnome_support> <gnome_support>False</gnome_support>
<gettext_support>True</gettext_support> <gettext_support>True</gettext_support>
<use_widget_names>True</use_widget_names>
<output_main_file>False</output_main_file>
<output_build_files>False</output_build_files>
<main_source_file>familiar_interface.c</main_source_file> <main_source_file>familiar_interface.c</main_source_file>
<main_header_file>familiar_interface.h</main_header_file> <main_header_file>familiar_interface.h</main_header_file>
<handler_source_file>familiar_callbacks.c</handler_source_file> <handler_source_file>familiar_callbacks.c</handler_source_file>
...@@ -37,9 +40,9 @@ ...@@ -37,9 +40,9 @@
<type>GTK_WINDOW_TOPLEVEL</type> <type>GTK_WINDOW_TOPLEVEL</type>
<position>GTK_WIN_POS_NONE</position> <position>GTK_WIN_POS_NONE</position>
<modal>False</modal> <modal>False</modal>
<allow_shrink>False</allow_shrink> <allow_shrink>True</allow_shrink>
<allow_grow>False</allow_grow> <allow_grow>True</allow_grow>
<auto_shrink>False</auto_shrink> <auto_shrink>True</auto_shrink>
<widget> <widget>
<class>GtkVBox</class> <class>GtkVBox</class>
...@@ -68,6 +71,12 @@ ...@@ -68,6 +71,12 @@
<class>GtkButton</class> <class>GtkButton</class>
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>toolbar_open</name> <name>toolbar_open</name>
<tooltip>Open file</tooltip>
<signal>
<name>clicked</name>
<handler>on_toolbar_open_clicked</handler>
<last_modification_time>Wed, 24 Jul 2002 18:28:31 GMT</last_modification_time>
</signal>
<label>Open</label> <label>Open</label>
<icon>familiar-openb16x16.xpm</icon> <icon>familiar-openb16x16.xpm</icon>
</widget> </widget>
...@@ -76,6 +85,12 @@ ...@@ -76,6 +85,12 @@
<class>GtkButton</class> <class>GtkButton</class>
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>toolbar_preferences</name> <name>toolbar_preferences</name>
<tooltip>Preferences</tooltip>
<signal>
<name>clicked</name>
<handler>on_toolbar_preferences_clicked</handler>
<last_modification_time>Wed, 24 Jul 2002 18:29:05 GMT</last_modification_time>
</signal>
<label>Preferences</label> <label>Preferences</label>
<icon>familiar-preferencesb16x16.xpm</icon> <icon>familiar-preferencesb16x16.xpm</icon>
</widget> </widget>
...@@ -84,6 +99,12 @@ ...@@ -84,6 +99,12 @@
<class>GtkButton</class> <class>GtkButton</class>
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>toolbar_rewind</name> <name>toolbar_rewind</name>
<tooltip>Rewind stream</tooltip>
<signal>
<name>clicked</name>
<handler>on_toolbar_rewind_clicked</handler>
<last_modification_time>Wed, 24 Jul 2002 18:28:45 GMT</last_modification_time>
</signal>
<label>Rewind</label> <label>Rewind</label>
<icon>familiar-rewindb16x16.xpm</icon> <icon>familiar-rewindb16x16.xpm</icon>
<child> <child>
...@@ -95,6 +116,12 @@ ...@@ -95,6 +116,12 @@
<class>GtkButton</class> <class>GtkButton</class>
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>toolbar_pause</name> <name>toolbar_pause</name>
<tooltip>Pause stream</tooltip>
<signal>
<name>clicked</name>
<handler>on_toolbar_pause_clicked</handler>
<last_modification_time>Wed, 24 Jul 2002 18:28:58 GMT</last_modification_time>
</signal>
<label>Pause</label> <label>Pause</label>
<icon>familiar-pauseb16x16.xpm</icon> <icon>familiar-pauseb16x16.xpm</icon>
</widget> </widget>
...@@ -103,6 +130,12 @@ ...@@ -103,6 +130,12 @@
<class>GtkButton</class> <class>GtkButton</class>
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>toolbar_play</name> <name>toolbar_play</name>
<tooltip>Play stream</tooltip>
<signal>
<name>clicked</name>
<handler>on_toolbar_play_clicked</handler>
<last_modification_time>Wed, 24 Jul 2002 18:29:12 GMT</last_modification_time>
</signal>
<label>Play</label> <label>Play</label>
<icon>familiar-playb16x16.xpm</icon> <icon>familiar-playb16x16.xpm</icon>
</widget> </widget>
...@@ -111,6 +144,12 @@ ...@@ -111,6 +144,12 @@
<class>GtkButton</class> <class>GtkButton</class>
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>toolbar_stop</name> <name>toolbar_stop</name>
<tooltip>Stop stream</tooltip>
<signal>
<name>clicked</name>
<handler>on_toolbar_stop_clicked</handler>
<last_modification_time>Wed, 24 Jul 2002 18:29:18 GMT</last_modification_time>
</signal>
<label>Stop</label> <label>Stop</label>
<icon>familiar-stopb16x16.xpm</icon> <icon>familiar-stopb16x16.xpm</icon>
</widget> </widget>
...@@ -119,6 +158,12 @@ ...@@ -119,6 +158,12 @@
<class>GtkButton</class> <class>GtkButton</class>
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>toolbar_forward</name> <name>toolbar_forward</name>
<tooltip>Forward stream</tooltip>
<signal>
<name>clicked</name>
<handler>on_toolbar_forward_clicked</handler>
<last_modification_time>Wed, 24 Jul 2002 18:29:25 GMT</last_modification_time>
</signal>
<label>Forward</label> <label>Forward</label>
<icon>familiar-forwardb16x16.xpm</icon> <icon>familiar-forwardb16x16.xpm</icon>
</widget> </widget>
...@@ -127,6 +172,12 @@ ...@@ -127,6 +172,12 @@
<class>GtkButton</class> <class>GtkButton</class>
<child_name>Toolbar:button</child_name> <child_name>Toolbar:button</child_name>
<name>toolbar_about</name> <name>toolbar_about</name>
<tooltip>About</tooltip>
<signal>
<name>clicked</name>
<handler>on_toolbar_about_clicked</handler>
<last_modification_time>Wed, 24 Jul 2002 18:29:31 GMT</last_modification_time>
</signal>
<label>About</label> <label>About</label>
<icon>vlc16x16.xpm</icon> <icon>vlc16x16.xpm</icon>
<child> <child>
...@@ -351,30 +402,28 @@ udp://localhost:1234/ ...@@ -351,30 +402,28 @@ udp://localhost:1234/
<widget> <widget>
<class>GtkRadioButton</class> <class>GtkRadioButton</class>
<name>rbIPv6</name> <name>rbIPv4</name>
<x>112</x> <x>8</x>
<y>8</y> <y>8</y>
<width>104</width> <width>104</width>
<height>26</height> <height>26</height>
<can_focus>True</can_focus> <can_focus>True</can_focus>
<label>IPv6</label> <label>IPv4</label>
<active>False</active> <active>True</active>
<draw_indicator>True</draw_indicator> <draw_indicator>True</draw_indicator>
<group>IPversion</group>
</widget> </widget>
<widget> <widget>
<class>GtkRadioButton</class> <class>GtkRadioButton</class>
<name>rbIPv4</name> <name>rbIPv6</name>
<x>8</x> <x>112</x>
<y>8</y> <y>8</y>
<width>104</width> <width>104</width>
<height>26</height> <height>26</height>
<can_focus>True</can_focus> <can_focus>True</can_focus>
<label>IPv4</label> <label>IPv6</label>
<active>True</active> <active>False</active>
<draw_indicator>True</draw_indicator> <draw_indicator>True</draw_indicator>
<group>IPversion</group>
</widget> </widget>
</widget> </widget>
</widget> </widget>
......
plugins/familiar/familiar.h
View file @ 30b91066
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* familiar.h: private Gtk+ interface description * familiar.h: private Gtk+ interface description
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: familiar.h,v 1.4 2002/07/23 18:39:29 jpsaman Exp $ * $Id: familiar.h,v 1.5 2002/07/24 20:46:08 jpsaman Exp $
* *
* Authors: Jean-Paul Saman <jpsaman@wxs.nl> * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
* *
...@@ -30,6 +30,10 @@ struct intf_sys_t ...@@ -30,6 +30,10 @@ struct intf_sys_t
{ {
/* windows and widgets */ /* windows and widgets */
GtkWidget * p_window; /* main window */ GtkWidget * p_window; /* main window */
GtkNotebook * p_notebook;
// GtkWidget * p_notebook_about;
// GtkWidget * p_notebook_open;
// GtkWidget * p_notebook_preferences;
/* The input thread */ /* The input thread */
input_thread_t * p_input; input_thread_t * p_input;
......
plugins/familiar/familiar_callbacks.c
View file @ 30b91066
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* familiar_callbacks.c : Callbacks for the Familiar Linux Gtk+ plugin. * familiar_callbacks.c : Callbacks for the Familiar Linux Gtk+ plugin.
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * Copyright (C) 2000, 2001 VideoLAN
* $Id: familiar_callbacks.c,v 1.3 2002/07/23 18:39:29 jpsaman Exp $ * $Id: familiar_callbacks.c,v 1.4 2002/07/24 20:46:08 jpsaman Exp $
* *
* Authors: Jean-Paul Saman <jpsaman@wxs.nl> * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
* *
...@@ -98,81 +98,138 @@ gboolean GtkExit( GtkWidget *widget, ...@@ -98,81 +98,138 @@ gboolean GtkExit( GtkWidget *widget,
} }
gboolean gboolean
on_xpm_open_button_press_event (GtkWidget *widget, on_familiar_destroy_event (GtkWidget *widget,
GdkEventButton *event, GdkEvent *event,
gpointer user_data) gpointer user_data)
{ {
GtkExit( GTK_WIDGET( widget ), user_data );
return FALSE; return TRUE;
} }
gboolean void
on_xpm_preferences_button_press_event (GtkWidget *widget, on_toolbar_open_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data) gpointer user_data)
{ {
intf_thread_t *p_intf = GtkGetIntf( button );
if (p_intf)
gtk_widget_show( GTK_WIDGET(p_intf->p_sys->p_notebook) );
}
return FALSE; void
on_toolbar_preferences_clicked (GtkButton *button,
gpointer user_data)
{
intf_thread_t *p_intf = GtkGetIntf( button );
if (p_intf)
gtk_widget_show( GTK_WIDGET(p_intf->p_sys->p_notebook) );
} }
gboolean void
on_xpm_rewind_button_press_event (GtkWidget *widget, on_toolbar_rewind_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data) gpointer user_data)
{ {
intf_thread_t * p_intf = GtkGetIntf( button );
return FALSE; if( p_intf )
{
if( p_intf->p_sys->p_input )
{
input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_SLOWER );
}
}
} }
gboolean void
on_xpm_pause_button_press_event (GtkWidget *widget, on_toolbar_pause_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data) gpointer user_data)
{ {
intf_thread_t * p_intf = GtkGetIntf( button );
return FALSE; if( p_intf )
{
if( p_intf->p_sys->p_input )
{
input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PAUSE );
}
}
} }
gboolean void
on_xpm_play_button_press_event (GtkWidget *widget, on_toolbar_play_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data) gpointer user_data)
{ {
intf_thread_t * p_intf = GtkGetIntf( button );
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
// Display open page
}
return FALSE; /* If the playlist is empty, open a file requester instead */
vlc_mutex_lock( &p_playlist->object_lock );
if( p_playlist->i_size )
{
vlc_mutex_unlock( &p_playlist->object_lock );
playlist_Play( p_playlist );
vlc_object_release( p_playlist );
}
else
{
vlc_mutex_unlock( &p_playlist->object_lock );
vlc_object_release( p_playlist );
// Display open page
}
} }
gboolean void
on_xpm_stop_button_press_event (GtkWidget *widget, on_toolbar_stop_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data) gpointer user_data)
{ {
intf_thread_t * p_intf = GtkGetIntf( button );
return FALSE; playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
if( p_playlist == NULL )
{
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
}
} }
gboolean void
on_xpm_forward_button_press_event (GtkWidget *widget, on_toolbar_forward_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data) gpointer user_data)
{ {
intf_thread_t * p_intf = GtkGetIntf( button );
return FALSE; if( p_intf )
{
if( p_intf->p_sys->p_input )
{
input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_FASTER );
}
}
} }
gboolean void
on_familiar_destroy_event (GtkWidget *widget, on_toolbar_about_clicked (GtkButton *button,
GdkEvent *event,
gpointer user_data) gpointer user_data)
{ {
GtkExit( GTK_WIDGET( widget ), user_data ); intf_thread_t *p_intf = GtkGetIntf( button );
return TRUE; if (p_intf)
{ // Toggle notebook
// if ( gtk_get_data( GTK_WIDGET(p_intf->p_sys->p_notebook), "visible" ) )
// gtk_widget_hide( GTK_WIDGET(p_intf->p_sys->p_notebook) );
// else
gtk_widget_show( GTK_WIDGET(p_intf->p_sys->p_notebook) );
}
} }
plugins/familiar/familiar_callbacks.h
View file @ 30b91066
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* familiar_callbacks.h : familiar plugin for vlc * familiar_callbacks.h : familiar plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: familiar_callbacks.h,v 1.4 2002/07/24 15:59:02 jpsaman Exp $ * $Id: familiar_callbacks.h,v 1.5 2002/07/24 20:46:08 jpsaman Exp $
* *
* Authors: Jean-Paul Saman <jpsaman@wxs.nl> * Authors: Jean-Paul Saman <jpsaman@wxs.nl>
* *
...@@ -26,41 +26,38 @@ ...@@ -26,41 +26,38 @@
gboolean GtkExit ( GtkWidget *, gpointer ); gboolean GtkExit ( GtkWidget *, gpointer );
gboolean gboolean
on_xpm_open_button_press_event (GtkWidget *widget, on_familiar_destroy_event (GtkWidget *widget,
GdkEventButton *event, GdkEvent *event,
gpointer user_data); gpointer user_data);
gboolean void
on_xpm_preferences_button_press_event (GtkWidget *widget, on_toolbar_open_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data); gpointer user_data);
gboolean void
on_xpm_rewind_button_press_event (GtkWidget *widget, on_toolbar_preferences_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data); gpointer user_data);
gboolean void
on_xpm_pause_button_press_event (GtkWidget *widget, on_toolbar_rewind_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data); gpointer user_data);
gboolean void
on_xpm_play_button_press_event (GtkWidget *widget, on_toolbar_pause_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data); gpointer user_data);
gboolean void
on_xpm_stop_button_press_event (GtkWidget *widget, on_toolbar_play_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data); gpointer user_data);
gboolean void
on_xpm_forward_button_press_event (GtkWidget *widget, on_toolbar_stop_clicked (GtkButton *button,
GdkEventButton *event,
gpointer user_data); gpointer user_data);
gboolean void
on_familiar_destroy_event (GtkWidget *widget, on_toolbar_forward_clicked (GtkButton *button,
GdkEvent *event, gpointer user_data);
void
on_toolbar_about_clicked (GtkButton *button,
gpointer user_data); gpointer user_data);
plugins/familiar/familiar_interface.c
View file @ 30b91066
...@@ -53,9 +53,9 @@ create_familiar (void) ...@@ -53,9 +53,9 @@ create_familiar (void)
GtkWidget *combo_entry2; GtkWidget *combo_entry2;
GtkWidget *frameIP; GtkWidget *frameIP;
GtkWidget *fixed2; GtkWidget *fixed2;
GSList *IPversion_group = NULL; GSList *fixed2_group = NULL;
GtkWidget *rbIPv6;
GtkWidget *rbIPv4; GtkWidget *rbIPv4;
GtkWidget *rbIPv6;
GtkWidget *preferences; GtkWidget *preferences;
GtkWidget *fixedAbout; GtkWidget *fixedAbout;
GtkWidget *logo; GtkWidget *logo;
...@@ -69,12 +69,14 @@ create_familiar (void) ...@@ -69,12 +69,14 @@ create_familiar (void)
tooltips = gtk_tooltips_new (); tooltips = gtk_tooltips_new ();
familiar = gtk_window_new (GTK_WINDOW_TOPLEVEL); familiar = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_name (familiar, "familiar");
gtk_object_set_data (GTK_OBJECT (familiar), "familiar", familiar); gtk_object_set_data (GTK_OBJECT (familiar), "familiar", familiar);
gtk_widget_set_usize (familiar, 240, 320); gtk_widget_set_usize (familiar, 240, 320);
gtk_window_set_title (GTK_WINDOW (familiar), _("vlc (familiar)")); gtk_window_set_title (GTK_WINDOW (familiar), _("vlc (familiar)"));
gtk_window_set_policy (GTK_WINDOW (familiar), FALSE, FALSE, FALSE); gtk_window_set_policy (GTK_WINDOW (familiar), TRUE, TRUE, TRUE);
vbox = gtk_vbox_new (FALSE, 0); vbox = gtk_vbox_new (FALSE, 0);
gtk_widget_set_name (vbox, "vbox");
gtk_widget_ref (vbox); gtk_widget_ref (vbox);
gtk_object_set_data_full (GTK_OBJECT (familiar), "vbox", vbox, gtk_object_set_data_full (GTK_OBJECT (familiar), "vbox", vbox,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -82,6 +84,7 @@ create_familiar (void) ...@@ -82,6 +84,7 @@ create_familiar (void)
gtk_container_add (GTK_CONTAINER (familiar), vbox); gtk_container_add (GTK_CONTAINER (familiar), vbox);
toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS); toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_ICONS);
gtk_widget_set_name (toolbar, "toolbar");
gtk_widget_ref (toolbar); gtk_widget_ref (toolbar);
gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar", toolbar, gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar", toolbar,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -94,8 +97,9 @@ create_familiar (void) ...@@ -94,8 +97,9 @@ create_familiar (void)
GTK_TOOLBAR_CHILD_BUTTON, GTK_TOOLBAR_CHILD_BUTTON,
NULL, NULL,
_("Open"), _("Open"),
NULL, NULL, _("Open file"), NULL,
tmp_toolbar_icon, NULL, NULL); tmp_toolbar_icon, NULL, NULL);
gtk_widget_set_name (toolbar_open, "toolbar_open");
gtk_widget_ref (toolbar_open); gtk_widget_ref (toolbar_open);
gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_open", toolbar_open, gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_open", toolbar_open,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -106,8 +110,9 @@ create_familiar (void) ...@@ -106,8 +110,9 @@ create_familiar (void)
GTK_TOOLBAR_CHILD_BUTTON, GTK_TOOLBAR_CHILD_BUTTON,
NULL, NULL,
_("Preferences"), _("Preferences"),
NULL, NULL, _("Preferences"), NULL,
tmp_toolbar_icon, NULL, NULL); tmp_toolbar_icon, NULL, NULL);
gtk_widget_set_name (toolbar_preferences, "toolbar_preferences");
gtk_widget_ref (toolbar_preferences); gtk_widget_ref (toolbar_preferences);
gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_preferences", toolbar_preferences, gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_preferences", toolbar_preferences,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -120,8 +125,9 @@ create_familiar (void) ...@@ -120,8 +125,9 @@ create_familiar (void)
GTK_TOOLBAR_CHILD_BUTTON, GTK_TOOLBAR_CHILD_BUTTON,
NULL, NULL,
_("Rewind"), _("Rewind"),
NULL, NULL, _("Rewind stream"), NULL,
tmp_toolbar_icon, NULL, NULL); tmp_toolbar_icon, NULL, NULL);
gtk_widget_set_name (toolbar_rewind, "toolbar_rewind");
gtk_widget_ref (toolbar_rewind); gtk_widget_ref (toolbar_rewind);
gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_rewind", toolbar_rewind, gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_rewind", toolbar_rewind,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -132,8 +138,9 @@ create_familiar (void) ...@@ -132,8 +138,9 @@ create_familiar (void)
GTK_TOOLBAR_CHILD_BUTTON, GTK_TOOLBAR_CHILD_BUTTON,
NULL, NULL,
_("Pause"), _("Pause"),
NULL, NULL, _("Pause stream"), NULL,
tmp_toolbar_icon, NULL, NULL); tmp_toolbar_icon, NULL, NULL);
gtk_widget_set_name (toolbar_pause, "toolbar_pause");
gtk_widget_ref (toolbar_pause); gtk_widget_ref (toolbar_pause);
gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_pause", toolbar_pause, gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_pause", toolbar_pause,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -144,8 +151,9 @@ create_familiar (void) ...@@ -144,8 +151,9 @@ create_familiar (void)
GTK_TOOLBAR_CHILD_BUTTON, GTK_TOOLBAR_CHILD_BUTTON,
NULL, NULL,
_("Play"), _("Play"),
NULL, NULL, _("Play stream"), NULL,
tmp_toolbar_icon, NULL, NULL); tmp_toolbar_icon, NULL, NULL);
gtk_widget_set_name (toolbar_play, "toolbar_play");
gtk_widget_ref (toolbar_play); gtk_widget_ref (toolbar_play);
gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_play", toolbar_play, gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_play", toolbar_play,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -156,8 +164,9 @@ create_familiar (void) ...@@ -156,8 +164,9 @@ create_familiar (void)
GTK_TOOLBAR_CHILD_BUTTON, GTK_TOOLBAR_CHILD_BUTTON,
NULL, NULL,
_("Stop"), _("Stop"),
NULL, NULL, _("Stop stream"), NULL,
tmp_toolbar_icon, NULL, NULL); tmp_toolbar_icon, NULL, NULL);
gtk_widget_set_name (toolbar_stop, "toolbar_stop");
gtk_widget_ref (toolbar_stop); gtk_widget_ref (toolbar_stop);
gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_stop", toolbar_stop, gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_stop", toolbar_stop,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -168,8 +177,9 @@ create_familiar (void) ...@@ -168,8 +177,9 @@ create_familiar (void)
GTK_TOOLBAR_CHILD_BUTTON, GTK_TOOLBAR_CHILD_BUTTON,
NULL, NULL,
_("Forward"), _("Forward"),
NULL, NULL, _("Forward stream"), NULL,
tmp_toolbar_icon, NULL, NULL); tmp_toolbar_icon, NULL, NULL);
gtk_widget_set_name (toolbar_forward, "toolbar_forward");
gtk_widget_ref (toolbar_forward); gtk_widget_ref (toolbar_forward);
gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_forward", toolbar_forward, gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_forward", toolbar_forward,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -182,14 +192,16 @@ create_familiar (void) ...@@ -182,14 +192,16 @@ create_familiar (void)
GTK_TOOLBAR_CHILD_BUTTON, GTK_TOOLBAR_CHILD_BUTTON,
NULL, NULL,
_("About"), _("About"),
NULL, NULL, _("About"), NULL,
tmp_toolbar_icon, NULL, NULL); tmp_toolbar_icon, NULL, NULL);
gtk_widget_set_name (toolbar_about, "toolbar_about");
gtk_widget_ref (toolbar_about); gtk_widget_ref (toolbar_about);
gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_about", toolbar_about, gtk_object_set_data_full (GTK_OBJECT (familiar), "toolbar_about", toolbar_about,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (toolbar_about); gtk_widget_show (toolbar_about);
progress = gtk_progress_bar_new (); progress = gtk_progress_bar_new ();
gtk_widget_set_name (progress, "progress");
gtk_widget_ref (progress); gtk_widget_ref (progress);
gtk_object_set_data_full (GTK_OBJECT (familiar), "progress", progress, gtk_object_set_data_full (GTK_OBJECT (familiar), "progress", progress,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -198,6 +210,7 @@ create_familiar (void) ...@@ -198,6 +210,7 @@ create_familiar (void)
gtk_progress_set_activity_mode (GTK_PROGRESS (progress), TRUE); gtk_progress_set_activity_mode (GTK_PROGRESS (progress), TRUE);
notebook = gtk_notebook_new (); notebook = gtk_notebook_new ();
gtk_widget_set_name (notebook, "notebook");
gtk_widget_ref (notebook); gtk_widget_ref (notebook);
gtk_object_set_data_full (GTK_OBJECT (familiar), "notebook", notebook, gtk_object_set_data_full (GTK_OBJECT (familiar), "notebook", notebook,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -205,6 +218,7 @@ create_familiar (void) ...@@ -205,6 +218,7 @@ create_familiar (void)
gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), notebook, TRUE, TRUE, 0);
fixedMedia = gtk_fixed_new (); fixedMedia = gtk_fixed_new ();
gtk_widget_set_name (fixedMedia, "fixedMedia");
gtk_widget_ref (fixedMedia); gtk_widget_ref (fixedMedia);
gtk_object_set_data_full (GTK_OBJECT (familiar), "fixedMedia", fixedMedia, gtk_object_set_data_full (GTK_OBJECT (familiar), "fixedMedia", fixedMedia,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -212,6 +226,7 @@ create_familiar (void) ...@@ -212,6 +226,7 @@ create_familiar (void)
gtk_container_add (GTK_CONTAINER (notebook), fixedMedia); gtk_container_add (GTK_CONTAINER (notebook), fixedMedia);
labelUrl = gtk_label_new (_("URL:")); labelUrl = gtk_label_new (_("URL:"));
gtk_widget_set_name (labelUrl, "labelUrl");
gtk_widget_ref (labelUrl); gtk_widget_ref (labelUrl);
gtk_object_set_data_full (GTK_OBJECT (familiar), "labelUrl", labelUrl, gtk_object_set_data_full (GTK_OBJECT (familiar), "labelUrl", labelUrl,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -221,6 +236,7 @@ create_familiar (void) ...@@ -221,6 +236,7 @@ create_familiar (void)
gtk_widget_set_usize (labelUrl, 38, 18); gtk_widget_set_usize (labelUrl, 38, 18);
listMedia = gtk_list_new (); listMedia = gtk_list_new ();
gtk_widget_set_name (listMedia, "listMedia");
gtk_widget_ref (listMedia); gtk_widget_ref (listMedia);
gtk_object_set_data_full (GTK_OBJECT (familiar), "listMedia", listMedia, gtk_object_set_data_full (GTK_OBJECT (familiar), "listMedia", listMedia,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -232,6 +248,7 @@ create_familiar (void) ...@@ -232,6 +248,7 @@ create_familiar (void)
gtk_list_set_selection_mode (GTK_LIST (listMedia), GTK_SELECTION_MULTIPLE); gtk_list_set_selection_mode (GTK_LIST (listMedia), GTK_SELECTION_MULTIPLE);
comboURL = gtk_combo_new (); comboURL = gtk_combo_new ();
gtk_widget_set_name (comboURL, "comboURL");
gtk_widget_ref (comboURL); gtk_widget_ref (comboURL);
gtk_object_set_data_full (GTK_OBJECT (familiar), "comboURL", comboURL, gtk_object_set_data_full (GTK_OBJECT (familiar), "comboURL", comboURL,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -247,6 +264,7 @@ create_familiar (void) ...@@ -247,6 +264,7 @@ create_familiar (void)
g_list_free (comboURL_items); g_list_free (comboURL_items);
combo_entry1 = GTK_COMBO (comboURL)->entry; combo_entry1 = GTK_COMBO (comboURL)->entry;
gtk_widget_set_name (combo_entry1, "combo_entry1");
gtk_widget_ref (combo_entry1); gtk_widget_ref (combo_entry1);
gtk_object_set_data_full (GTK_OBJECT (familiar), "combo_entry1", combo_entry1, gtk_object_set_data_full (GTK_OBJECT (familiar), "combo_entry1", combo_entry1,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -254,6 +272,7 @@ create_familiar (void) ...@@ -254,6 +272,7 @@ create_familiar (void)
gtk_entry_set_text (GTK_ENTRY (combo_entry1), _("file://")); gtk_entry_set_text (GTK_ENTRY (combo_entry1), _("file://"));
media = gtk_label_new (_("Media")); media = gtk_label_new (_("Media"));
gtk_widget_set_name (media, "media");
gtk_widget_ref (media); gtk_widget_ref (media);
gtk_object_set_data_full (GTK_OBJECT (familiar), "media", media, gtk_object_set_data_full (GTK_OBJECT (familiar), "media", media,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -261,6 +280,7 @@ create_familiar (void) ...@@ -261,6 +280,7 @@ create_familiar (void)
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), media); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 0), media);
fixedPreferences = gtk_fixed_new (); fixedPreferences = gtk_fixed_new ();
gtk_widget_set_name (fixedPreferences, "fixedPreferences");
gtk_widget_ref (fixedPreferences); gtk_widget_ref (fixedPreferences);
gtk_object_set_data_full (GTK_OBJECT (familiar), "fixedPreferences", fixedPreferences, gtk_object_set_data_full (GTK_OBJECT (familiar), "fixedPreferences", fixedPreferences,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -268,6 +288,7 @@ create_familiar (void) ...@@ -268,6 +288,7 @@ create_familiar (void)
gtk_container_add (GTK_CONTAINER (notebook), fixedPreferences); gtk_container_add (GTK_CONTAINER (notebook), fixedPreferences);
buttonSave = gtk_button_new_with_label (_("Save")); buttonSave = gtk_button_new_with_label (_("Save"));
gtk_widget_set_name (buttonSave, "buttonSave");
gtk_widget_ref (buttonSave); gtk_widget_ref (buttonSave);
gtk_object_set_data_full (GTK_OBJECT (familiar), "buttonSave", buttonSave, gtk_object_set_data_full (GTK_OBJECT (familiar), "buttonSave", buttonSave,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -277,6 +298,7 @@ create_familiar (void) ...@@ -277,6 +298,7 @@ create_familiar (void)
gtk_widget_set_usize (buttonSave, 54, 24); gtk_widget_set_usize (buttonSave, 54, 24);
buttonApply = gtk_button_new_with_label (_("Apply")); buttonApply = gtk_button_new_with_label (_("Apply"));
gtk_widget_set_name (buttonApply, "buttonApply");
gtk_widget_ref (buttonApply); gtk_widget_ref (buttonApply);
gtk_object_set_data_full (GTK_OBJECT (familiar), "buttonApply", buttonApply, gtk_object_set_data_full (GTK_OBJECT (familiar), "buttonApply", buttonApply,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -286,6 +308,7 @@ create_familiar (void) ...@@ -286,6 +308,7 @@ create_familiar (void)
gtk_widget_set_usize (buttonApply, 54, 24); gtk_widget_set_usize (buttonApply, 54, 24);
buttonCancel = gtk_button_new_with_label (_("Cancel")); buttonCancel = gtk_button_new_with_label (_("Cancel"));
gtk_widget_set_name (buttonCancel, "buttonCancel");
gtk_widget_ref (buttonCancel); gtk_widget_ref (buttonCancel);
gtk_object_set_data_full (GTK_OBJECT (familiar), "buttonCancel", buttonCancel, gtk_object_set_data_full (GTK_OBJECT (familiar), "buttonCancel", buttonCancel,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -295,6 +318,7 @@ create_familiar (void) ...@@ -295,6 +318,7 @@ create_familiar (void)
gtk_widget_set_usize (buttonCancel, 54, 24); gtk_widget_set_usize (buttonCancel, 54, 24);
frameDefaultURL = gtk_frame_new (_("Default URL:")); frameDefaultURL = gtk_frame_new (_("Default URL:"));
gtk_widget_set_name (frameDefaultURL, "frameDefaultURL");
gtk_widget_ref (frameDefaultURL); gtk_widget_ref (frameDefaultURL);
gtk_object_set_data_full (GTK_OBJECT (familiar), "frameDefaultURL", frameDefaultURL, gtk_object_set_data_full (GTK_OBJECT (familiar), "frameDefaultURL", frameDefaultURL,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -304,6 +328,7 @@ create_familiar (void) ...@@ -304,6 +328,7 @@ create_familiar (void)
gtk_widget_set_usize (frameDefaultURL, 220, 60); gtk_widget_set_usize (frameDefaultURL, 220, 60);
fixed3 = gtk_fixed_new (); fixed3 = gtk_fixed_new ();
gtk_widget_set_name (fixed3, "fixed3");
gtk_widget_ref (fixed3); gtk_widget_ref (fixed3);
gtk_object_set_data_full (GTK_OBJECT (familiar), "fixed3", fixed3, gtk_object_set_data_full (GTK_OBJECT (familiar), "fixed3", fixed3,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -311,6 +336,7 @@ create_familiar (void) ...@@ -311,6 +336,7 @@ create_familiar (void)
gtk_container_add (GTK_CONTAINER (frameDefaultURL), fixed3); gtk_container_add (GTK_CONTAINER (frameDefaultURL), fixed3);
comboDefaultURL = gtk_combo_new (); comboDefaultURL = gtk_combo_new ();
gtk_widget_set_name (comboDefaultURL, "comboDefaultURL");
gtk_widget_ref (comboDefaultURL); gtk_widget_ref (comboDefaultURL);
gtk_object_set_data_full (GTK_OBJECT (familiar), "comboDefaultURL", comboDefaultURL, gtk_object_set_data_full (GTK_OBJECT (familiar), "comboDefaultURL", comboDefaultURL,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -326,6 +352,7 @@ create_familiar (void) ...@@ -326,6 +352,7 @@ create_familiar (void)
g_list_free (comboDefaultURL_items); g_list_free (comboDefaultURL_items);
combo_entry2 = GTK_COMBO (comboDefaultURL)->entry; combo_entry2 = GTK_COMBO (comboDefaultURL)->entry;
gtk_widget_set_name (combo_entry2, "combo_entry2");
gtk_widget_ref (combo_entry2); gtk_widget_ref (combo_entry2);
gtk_object_set_data_full (GTK_OBJECT (familiar), "combo_entry2", combo_entry2, gtk_object_set_data_full (GTK_OBJECT (familiar), "combo_entry2", combo_entry2,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -333,6 +360,7 @@ create_familiar (void) ...@@ -333,6 +360,7 @@ create_familiar (void)
gtk_entry_set_text (GTK_ENTRY (combo_entry2), _("file://")); gtk_entry_set_text (GTK_ENTRY (combo_entry2), _("file://"));
frameIP = gtk_frame_new (_("IP version:")); frameIP = gtk_frame_new (_("IP version:"));
gtk_widget_set_name (frameIP, "frameIP");
gtk_widget_ref (frameIP); gtk_widget_ref (frameIP);
gtk_object_set_data_full (GTK_OBJECT (familiar), "frameIP", frameIP, gtk_object_set_data_full (GTK_OBJECT (familiar), "frameIP", frameIP,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -342,24 +370,16 @@ create_familiar (void) ...@@ -342,24 +370,16 @@ create_familiar (void)
gtk_widget_set_usize (frameIP, 220, 60); gtk_widget_set_usize (frameIP, 220, 60);
fixed2 = gtk_fixed_new (); fixed2 = gtk_fixed_new ();
gtk_widget_set_name (fixed2, "fixed2");
gtk_widget_ref (fixed2); gtk_widget_ref (fixed2);
gtk_object_set_data_full (GTK_OBJECT (familiar), "fixed2", fixed2, gtk_object_set_data_full (GTK_OBJECT (familiar), "fixed2", fixed2,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (fixed2); gtk_widget_show (fixed2);
gtk_container_add (GTK_CONTAINER (frameIP), fixed2); gtk_container_add (GTK_CONTAINER (frameIP), fixed2);
rbIPv6 = gtk_radio_button_new_with_label (IPversion_group, _("IPv6")); rbIPv4 = gtk_radio_button_new_with_label (fixed2_group, _("IPv4"));
IPversion_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rbIPv6)); fixed2_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rbIPv4));
gtk_widget_ref (rbIPv6); gtk_widget_set_name (rbIPv4, "rbIPv4");
gtk_object_set_data_full (GTK_OBJECT (familiar), "rbIPv6", rbIPv6,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rbIPv6);
gtk_fixed_put (GTK_FIXED (fixed2), rbIPv6, 112, 8);
gtk_widget_set_uposition (rbIPv6, 112, 8);
gtk_widget_set_usize (rbIPv6, 104, 26);
rbIPv4 = gtk_radio_button_new_with_label (IPversion_group, _("IPv4"));
IPversion_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rbIPv4));
gtk_widget_ref (rbIPv4); gtk_widget_ref (rbIPv4);
gtk_object_set_data_full (GTK_OBJECT (familiar), "rbIPv4", rbIPv4, gtk_object_set_data_full (GTK_OBJECT (familiar), "rbIPv4", rbIPv4,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -369,7 +389,19 @@ create_familiar (void) ...@@ -369,7 +389,19 @@ create_familiar (void)
gtk_widget_set_usize (rbIPv4, 104, 26); gtk_widget_set_usize (rbIPv4, 104, 26);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rbIPv4), TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rbIPv4), TRUE);
rbIPv6 = gtk_radio_button_new_with_label (fixed2_group, _("IPv6"));
fixed2_group = gtk_radio_button_group (GTK_RADIO_BUTTON (rbIPv6));
gtk_widget_set_name (rbIPv6, "rbIPv6");
gtk_widget_ref (rbIPv6);
gtk_object_set_data_full (GTK_OBJECT (familiar), "rbIPv6", rbIPv6,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (rbIPv6);
gtk_fixed_put (GTK_FIXED (fixed2), rbIPv6, 112, 8);
gtk_widget_set_uposition (rbIPv6, 112, 8);
gtk_widget_set_usize (rbIPv6, 104, 26);
preferences = gtk_label_new (_("Preference")); preferences = gtk_label_new (_("Preference"));
gtk_widget_set_name (preferences, "preferences");
gtk_widget_ref (preferences); gtk_widget_ref (preferences);
gtk_object_set_data_full (GTK_OBJECT (familiar), "preferences", preferences, gtk_object_set_data_full (GTK_OBJECT (familiar), "preferences", preferences,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -377,6 +409,7 @@ create_familiar (void) ...@@ -377,6 +409,7 @@ create_familiar (void)
gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), preferences); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 1), preferences);
fixedAbout = gtk_fixed_new (); fixedAbout = gtk_fixed_new ();
gtk_widget_set_name (fixedAbout, "fixedAbout");
gtk_widget_ref (fixedAbout); gtk_widget_ref (fixedAbout);
gtk_object_set_data_full (GTK_OBJECT (familiar), "fixedAbout", fixedAbout, gtk_object_set_data_full (GTK_OBJECT (familiar), "fixedAbout", fixedAbout,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -384,6 +417,7 @@ create_familiar (void) ...@@ -384,6 +417,7 @@ create_familiar (void)
gtk_container_add (GTK_CONTAINER (notebook), fixedAbout); gtk_container_add (GTK_CONTAINER (notebook), fixedAbout);
logo = create_pixmap (familiar, "vlc32x32.xpm"); logo = create_pixmap (familiar, "vlc32x32.xpm");
gtk_widget_set_name (logo, "logo");
gtk_widget_ref (logo); gtk_widget_ref (logo);
gtk_object_set_data_full (GTK_OBJECT (familiar), "logo", logo, gtk_object_set_data_full (GTK_OBJECT (familiar), "logo", logo,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -393,6 +427,7 @@ create_familiar (void) ...@@ -393,6 +427,7 @@ create_familiar (void)
gtk_widget_set_usize (logo, 50, 50); gtk_widget_set_usize (logo, 50, 50);
labelVlc = gtk_label_new (_("VideoLAN Client\n for familiar Linux")); labelVlc = gtk_label_new (_("VideoLAN Client\n for familiar Linux"));
gtk_widget_set_name (labelVlc, "labelVlc");
gtk_widget_ref (labelVlc); gtk_widget_ref (labelVlc);
gtk_object_set_data_full (GTK_OBJECT (familiar), "labelVlc", labelVlc, gtk_object_set_data_full (GTK_OBJECT (familiar), "labelVlc", labelVlc,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -403,6 +438,7 @@ create_familiar (void) ...@@ -403,6 +438,7 @@ create_familiar (void)
gtk_label_set_line_wrap (GTK_LABEL (labelVlc), TRUE); gtk_label_set_line_wrap (GTK_LABEL (labelVlc), TRUE);
labelCopyright = gtk_label_new (_("(c) 2002, the VideoLAN Team")); labelCopyright = gtk_label_new (_("(c) 2002, the VideoLAN Team"));
gtk_widget_set_name (labelCopyright, "labelCopyright");
gtk_widget_ref (labelCopyright); gtk_widget_ref (labelCopyright);
gtk_object_set_data_full (GTK_OBJECT (familiar), "labelCopyright", labelCopyright, gtk_object_set_data_full (GTK_OBJECT (familiar), "labelCopyright", labelCopyright,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -412,6 +448,7 @@ create_familiar (void) ...@@ -412,6 +448,7 @@ create_familiar (void)
gtk_widget_set_usize (labelCopyright, 200, 18); gtk_widget_set_usize (labelCopyright, 200, 18);
labelAuthors = gtk_label_new (_("Authors: The VideoLAN Team, http://www.videolan.org")); labelAuthors = gtk_label_new (_("Authors: The VideoLAN Team, http://www.videolan.org"));
gtk_widget_set_name (labelAuthors, "labelAuthors");
gtk_widget_ref (labelAuthors); gtk_widget_ref (labelAuthors);
gtk_object_set_data_full (GTK_OBJECT (familiar), "labelAuthors", labelAuthors, gtk_object_set_data_full (GTK_OBJECT (familiar), "labelAuthors", labelAuthors,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -422,6 +459,7 @@ create_familiar (void) ...@@ -422,6 +459,7 @@ create_familiar (void)
gtk_label_set_line_wrap (GTK_LABEL (labelAuthors), TRUE); gtk_label_set_line_wrap (GTK_LABEL (labelAuthors), TRUE);
labelAbout = gtk_label_new (_("The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input from local or network sources.")); labelAbout = gtk_label_new (_("The VideoLAN Client is a MPEG, MPEG 2, MP3, DivX player, that accepts input from local or network sources."));
gtk_widget_set_name (labelAbout, "labelAbout");
gtk_widget_ref (labelAbout); gtk_widget_ref (labelAbout);
gtk_object_set_data_full (GTK_OBJECT (familiar), "labelAbout", labelAbout, gtk_object_set_data_full (GTK_OBJECT (familiar), "labelAbout", labelAbout,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -433,6 +471,7 @@ create_familiar (void) ...@@ -433,6 +471,7 @@ create_familiar (void)
gtk_label_set_line_wrap (GTK_LABEL (labelAbout), TRUE); gtk_label_set_line_wrap (GTK_LABEL (labelAbout), TRUE);
about = gtk_label_new (_("About")); about = gtk_label_new (_("About"));
gtk_widget_set_name (about, "about");
gtk_widget_ref (about); gtk_widget_ref (about);
gtk_object_set_data_full (GTK_OBJECT (familiar), "about", about, gtk_object_set_data_full (GTK_OBJECT (familiar), "about", about,
(GtkDestroyNotify) gtk_widget_unref); (GtkDestroyNotify) gtk_widget_unref);
...@@ -445,6 +484,30 @@ create_familiar (void) ...@@ -445,6 +484,30 @@ create_familiar (void)
gtk_signal_connect (GTK_OBJECT (familiar), "destroy", gtk_signal_connect (GTK_OBJECT (familiar), "destroy",
GTK_SIGNAL_FUNC (gtk_main_quit), GTK_SIGNAL_FUNC (gtk_main_quit),
NULL); NULL);
gtk_signal_connect (GTK_OBJECT (toolbar_open), "clicked",
GTK_SIGNAL_FUNC (on_toolbar_open_clicked),
NULL);
gtk_signal_connect (GTK_OBJECT (toolbar_preferences), "clicked",
GTK_SIGNAL_FUNC (on_toolbar_preferences_clicked),
NULL);
gtk_signal_connect (GTK_OBJECT (toolbar_rewind), "clicked",
GTK_SIGNAL_FUNC (on_toolbar_rewind_clicked),
NULL);
gtk_signal_connect (GTK_OBJECT (toolbar_pause), "clicked",
GTK_SIGNAL_FUNC (on_toolbar_pause_clicked),
NULL);
gtk_signal_connect (GTK_OBJECT (toolbar_play), "clicked",
GTK_SIGNAL_FUNC (on_toolbar_play_clicked),
NULL);
gtk_signal_connect (GTK_OBJECT (toolbar_stop), "clicked",
GTK_SIGNAL_FUNC (on_toolbar_stop_clicked),
NULL);
gtk_signal_connect (GTK_OBJECT (toolbar_forward), "clicked",
GTK_SIGNAL_FUNC (on_toolbar_forward_clicked),
NULL);
gtk_signal_connect (GTK_OBJECT (toolbar_about), "clicked",
GTK_SIGNAL_FUNC (on_toolbar_about_clicked),
NULL);
gtk_object_set_data (GTK_OBJECT (familiar), "tooltips", tooltips); gtk_object_set_data (GTK_OBJECT (familiar), "tooltips", tooltips);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment