diff -ur vlc-0.8.4a/modules/gui/pda/pda.c vlc-0.8.4a-pda/modules/gui/pda/pda.c --- vlc-0.8.4a/modules/gui/pda/pda.c 2005-12-11 22:36:19.000000000 +0100 +++ vlc-0.8.4a-pda/modules/gui/pda/pda.c 2006-04-04 17:41:06.000000000 +0200 @@ -445,8 +445,6 @@ } /* Manage the slider */ -#if 0 -#define p_area p_input->p_selected_area if (p_intf->p_libvlc->i_cpu & CPU_CAPABILITY_FPU) { /* Manage the slider for CPU_CAPABILITY_FPU hardware */ @@ -461,7 +459,7 @@ /* Update the value */ p_intf->p_sys->p_adj->value = p_intf->p_sys->f_adj_oldvalue = - ( 100. * p_area->i_tell ) / p_area->i_size; + ( 100. * var_GetTime( p_intf->p_sys->p_input, "time" ) ) / var_GetTime( p_intf->p_sys->p_input, "length" ); g_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ), "value_changed" ); } @@ -495,7 +493,7 @@ /* Update the value */ p_intf->p_sys->p_adj->value = p_intf->p_sys->i_adj_oldvalue = - ( 100 * p_area->i_tell ) / p_area->i_size; + ( 100 * var_GetTime( p_intf->p_sys->p_input, "time" ) ) / var_GetTime( p_intf->p_sys->p_input, "length" ); g_signal_emit_by_name( GTK_OBJECT( p_intf->p_sys->p_adj ), "value_changed" ); } @@ -515,8 +513,6 @@ } } } -#undef p_area -#endif } vlc_mutex_unlock( &p_input->object_lock ); } diff -ur vlc-0.8.4a/modules/gui/pda/pda_callbacks.c vlc-0.8.4a-pda/modules/gui/pda/pda_callbacks.c --- vlc-0.8.4a/modules/gui/pda/pda_callbacks.c 2005-12-11 22:36:19.000000000 +0100 +++ vlc-0.8.4a-pda/modules/gui/pda/pda_callbacks.c 2006-04-05 10:26:41.000000000 +0200 @@ -442,7 +442,7 @@ p_intf->p_sys->b_slider_free = 1; vlc_mutex_unlock( &p_intf->change_lock ); - return TRUE; + return FALSE; } @@ -455,7 +455,7 @@ p_intf->p_sys->b_slider_free = 0; vlc_mutex_unlock( &p_intf->change_lock ); - return TRUE; + return FALSE; } void SliderMove(GtkRange *range, GtkScrollType scroll, gpointer user_data) @@ -1102,6 +1102,8 @@ p_entryStdURL = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryStdURL" ); p_entryStdAnnounce = (GtkEntry*) lookup_widget( GTK_WIDGET(button), "entryAnnounceChannel" ); p_entryStdTTL = (GtkSpinButton*) lookup_widget( GTK_WIDGET(button), "entryStdTTL" ); + p_checkSAP = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkSAP" ); + p_checkSLP = (GtkCheckButton*) lookup_widget( GTK_WIDGET(button), "checkSLP" ); p_std_access = gtk_entry_get_text(GTK_ENTRY(p_entryStdAccess)); p_std_muxer = gtk_entry_get_text(GTK_ENTRY(p_entryStdMuxer)); diff -ur vlc-0.8.4a/modules/gui/pda/pda.glade vlc-0.8.4a-pda/modules/gui/pda/pda.glade --- vlc-0.8.4a/modules/gui/pda/pda.glade 2005-12-11 22:36:19.000000000 +0100 +++ vlc-0.8.4a-pda/modules/gui/pda/pda.glade 2006-04-05 10:50:39.000000000 +0200 @@ -14,6 +14,12 @@ True False vlc16x16.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True @@ -30,9 +36,23 @@ GTK_ORIENTATION_HORIZONTAL GTK_TOOLBAR_ICONS True + True - + + True + True + True + True + + + False + False + + + + + 22 22 True @@ -40,16 +60,19 @@ Rewind True pda-rewindb16x16.xpm - True + True + True + False - True + False + True - + 22 22 True @@ -57,12 +80,19 @@ Pause True pda-pauseb16x16.xpm + True + True + False + + False + True + - + 22 22 True @@ -70,12 +100,19 @@ Play True pda-playb16x16.xpm + True + True + False + + False + True + - + 22 22 True @@ -83,12 +120,19 @@ Stop True pda-stopb16x16.xpm + True + True + False + + False + True + - + 22 22 True @@ -96,12 +140,32 @@ Forward True pda-forwardb16x16.xpm + True + True + False + + False + True + - + + True + True + True + True + + + False + False + + + + + 22 22 True @@ -109,31 +173,47 @@ About True vlc16x16.png - True + True + True + False - True + False + True - + True - 00:00:00 - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - True + True + True + False + + + + True + 00:00:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + - True + False + False @@ -212,6 +292,9 @@ False False True + False + False + False @@ -240,6 +323,7 @@ Add to Playlist True GTK_RELIEF_NORMAL + True @@ -276,13 +360,17 @@ File False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -311,13 +399,17 @@ MRL: False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -462,6 +554,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -486,6 +582,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -628,6 +728,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -756,6 +860,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -780,6 +888,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -798,6 +910,7 @@ enable True GTK_RELIEF_NORMAL + True False False True @@ -836,6 +949,7 @@ Add to Playlist True GTK_RELIEF_NORMAL + True @@ -857,7 +971,7 @@ - True + False True @@ -868,13 +982,17 @@ Network False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -923,6 +1041,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -947,6 +1069,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -971,6 +1097,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -995,6 +1125,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1019,6 +1153,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1043,6 +1181,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1067,6 +1209,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1091,6 +1237,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1115,6 +1265,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1139,6 +1293,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1163,6 +1321,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1187,6 +1349,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1677,6 +1843,7 @@ enable True GTK_RELIEF_NORMAL + True False False True @@ -1726,6 +1893,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1744,6 +1915,7 @@ enable True GTK_RELIEF_NORMAL + True False False True @@ -1786,6 +1958,7 @@ Add to Playlist True GTK_RELIEF_NORMAL + True @@ -1825,6 +1998,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -1873,6 +2050,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -1993,6 +2174,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2017,6 +2202,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2041,6 +2230,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2065,6 +2258,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2089,6 +2286,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2113,6 +2314,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2137,6 +2342,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2161,6 +2370,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2185,6 +2398,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2507,6 +2724,7 @@ enable True GTK_RELIEF_NORMAL + True False False True @@ -2553,7 +2771,7 @@ GTK_UPDATE_ALWAYS False False - 800000 0 1e+06 1 10 10 + 800000 0 1000000 1 10 10 1 @@ -2599,6 +2817,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2730,6 +2952,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2748,6 +2974,7 @@ enable True GTK_RELIEF_NORMAL + True False False True @@ -2769,6 +2996,7 @@ enable True GTK_RELIEF_NORMAL + True False False True @@ -2796,6 +3024,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2820,6 +3052,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -2898,6 +3134,7 @@ Add to Playlist True GTK_RELIEF_NORMAL + True @@ -2930,13 +3167,17 @@ Transcode False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -2965,6 +3206,9 @@ False False True + False + False + False @@ -2992,6 +3236,7 @@ Update True GTK_RELIEF_NORMAL + True @@ -3008,6 +3253,7 @@ Delete True GTK_RELIEF_NORMAL + True @@ -3024,6 +3270,7 @@ Clear True GTK_RELIEF_NORMAL + True @@ -3052,13 +3299,17 @@ Playlist False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -3088,6 +3339,9 @@ False False True + False + False + False @@ -3111,6 +3365,7 @@ Save True GTK_RELIEF_NORMAL + True @@ -3127,6 +3382,7 @@ Apply True GTK_RELIEF_NORMAL + True @@ -3147,6 +3403,7 @@ Cancel True GTK_RELIEF_NORMAL + True @@ -3177,13 +3434,17 @@ Preference False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab @@ -3239,6 +3500,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 16 @@ -3247,46 +3512,54 @@ - + 208 - 32 + 16 True - Authors: the VideoLAN Team, http://www.videolan.org/team/ + (c) 1996-2004 the VideoLAN team False False - GTK_JUSTIFY_LEFT - True + GTK_JUSTIFY_CENTER + False False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 16 - 72 + 48 - + 208 - 16 + 32 True - (c) 1996-2004 the VideoLAN team + Authors: the VideoLAN Team, http://www.videolan.org/team/ False False - GTK_JUSTIFY_CENTER - False + GTK_JUSTIFY_LEFT + True False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 16 - 48 + 72 @@ -3305,6 +3578,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 48 @@ -3328,13 +3605,17 @@ About False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab diff -ur vlc-0.8.4a/modules/gui/pda/pda_interface.c vlc-0.8.4a-pda/modules/gui/pda/pda_interface.c --- vlc-0.8.4a/modules/gui/pda/pda_interface.c 2005-12-11 22:36:19.000000000 +0100 +++ vlc-0.8.4a-pda/modules/gui/pda/pda_interface.c 2006-04-05 10:50:39.000000000 +0200 @@ -33,13 +33,17 @@ GdkPixbuf *pda_icon_pixbuf; GtkWidget *vbox; GtkWidget *toolbar; - GtkWidget *tmp_toolbar_icon; + GtkIconSize tmp_toolbar_icon_size; + GtkWidget *separatortoolitem1; + GtkWidget *tmp_image; GtkWidget *tbRewind; GtkWidget *tbPause; GtkWidget *tbPlay; GtkWidget *tbStop; GtkWidget *tbForward; + GtkWidget *separatortoolitem2; GtkWidget *tbAbout; + GtkWidget *toolitem1; GtkWidget *timeLabel; GtkWidget *timeSlider; GtkWidget *notebook; @@ -198,8 +202,8 @@ GtkWidget *fixed2; GtkWidget *aboutImage; GtkWidget *labelDescription; - GtkWidget *labelAuthors; GtkWidget *labelCopyright; + GtkWidget *labelAuthors; GtkWidget *labelProgramName; GtkWidget *about; GtkTooltips *tooltips; @@ -228,89 +232,81 @@ gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 5); gtk_widget_set_size_request (toolbar, 240, 22); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS); + tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar)); - gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); - - tmp_toolbar_icon = create_pixmap (pda, "pda-rewindb16x16.xpm"); - tbRewind = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - _("Rewind"), - _("Rewind"), NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); + separatortoolitem1 = (GtkWidget*) gtk_separator_tool_item_new (); + gtk_widget_set_name (separatortoolitem1, "separatortoolitem1"); + gtk_widget_show (separatortoolitem1); + gtk_container_add (GTK_CONTAINER (toolbar), separatortoolitem1); + + tmp_image = create_pixmap (pda, "pda-rewindb16x16.xpm"); + gtk_widget_show (tmp_image); + tbRewind = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Rewind")); gtk_widget_set_name (tbRewind, "tbRewind"); gtk_widget_show (tbRewind); + gtk_container_add (GTK_CONTAINER (toolbar), tbRewind); gtk_widget_set_size_request (tbRewind, 22, 22); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbRewind), tooltips, _("Rewind"), NULL); - tmp_toolbar_icon = create_pixmap (pda, "pda-pauseb16x16.xpm"); - tbPause = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - _("Pause"), - _("Pause"), NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); + tmp_image = create_pixmap (pda, "pda-pauseb16x16.xpm"); + gtk_widget_show (tmp_image); + tbPause = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Pause")); gtk_widget_set_name (tbPause, "tbPause"); gtk_widget_show (tbPause); + gtk_container_add (GTK_CONTAINER (toolbar), tbPause); gtk_widget_set_size_request (tbPause, 22, 22); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbPause), tooltips, _("Pause"), NULL); - tmp_toolbar_icon = create_pixmap (pda, "pda-playb16x16.xpm"); - tbPlay = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - _("Play"), - _("Play"), NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); + tmp_image = create_pixmap (pda, "pda-playb16x16.xpm"); + gtk_widget_show (tmp_image); + tbPlay = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Play")); gtk_widget_set_name (tbPlay, "tbPlay"); gtk_widget_show (tbPlay); + gtk_container_add (GTK_CONTAINER (toolbar), tbPlay); gtk_widget_set_size_request (tbPlay, 22, 22); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbPlay), tooltips, _("Play"), NULL); - tmp_toolbar_icon = create_pixmap (pda, "pda-stopb16x16.xpm"); - tbStop = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - _("Stop"), - _("Stop"), NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); + tmp_image = create_pixmap (pda, "pda-stopb16x16.xpm"); + gtk_widget_show (tmp_image); + tbStop = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Stop")); gtk_widget_set_name (tbStop, "tbStop"); gtk_widget_show (tbStop); + gtk_container_add (GTK_CONTAINER (toolbar), tbStop); gtk_widget_set_size_request (tbStop, 22, 22); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbStop), tooltips, _("Stop"), NULL); - tmp_toolbar_icon = create_pixmap (pda, "pda-forwardb16x16.xpm"); - tbForward = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - _("Forward"), - _("Forward"), NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); + tmp_image = create_pixmap (pda, "pda-forwardb16x16.xpm"); + gtk_widget_show (tmp_image); + tbForward = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Forward")); gtk_widget_set_name (tbForward, "tbForward"); gtk_widget_show (tbForward); + gtk_container_add (GTK_CONTAINER (toolbar), tbForward); gtk_widget_set_size_request (tbForward, 22, 22); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbForward), tooltips, _("Forward"), NULL); - gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); - - tmp_toolbar_icon = create_pixmap (pda, "vlc16x16.png"); - tbAbout = gtk_toolbar_append_element (GTK_TOOLBAR (toolbar), - GTK_TOOLBAR_CHILD_BUTTON, - NULL, - _("About"), - _("About"), NULL, - tmp_toolbar_icon, NULL, NULL); - gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (toolbar)->children)->data))->label), TRUE); + separatortoolitem2 = (GtkWidget*) gtk_separator_tool_item_new (); + gtk_widget_set_name (separatortoolitem2, "separatortoolitem2"); + gtk_widget_show (separatortoolitem2); + gtk_container_add (GTK_CONTAINER (toolbar), separatortoolitem2); + + tmp_image = create_pixmap (pda, "vlc16x16.png"); + gtk_widget_show (tmp_image); + tbAbout = (GtkWidget*) gtk_tool_button_new (tmp_image, _("About")); gtk_widget_set_name (tbAbout, "tbAbout"); gtk_widget_show (tbAbout); + gtk_container_add (GTK_CONTAINER (toolbar), tbAbout); gtk_widget_set_size_request (tbAbout, 22, 22); + gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (tbAbout), tooltips, _("About"), NULL); + + toolitem1 = (GtkWidget*) gtk_tool_item_new (); + gtk_widget_set_name (toolitem1, "toolitem1"); + gtk_widget_show (toolitem1); + gtk_container_add (GTK_CONTAINER (toolbar), toolitem1); - timeLabel = gtk_label_new (_("00:00:00")); + timeLabel = gtk_label_new ("00:00:00"); gtk_widget_set_name (timeLabel, "timeLabel"); gtk_widget_show (timeLabel); - gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); - - gtk_toolbar_append_widget (GTK_TOOLBAR (toolbar), timeLabel, NULL, NULL); + gtk_container_add (GTK_CONTAINER (toolitem1), timeLabel); timeSlider = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 1, 6.25, 0))); gtk_widget_set_name (timeSlider, "timeSlider"); @@ -372,8 +368,6 @@ gtk_widget_set_name (vbox5, "vbox5"); gtk_widget_show (vbox5); gtk_container_add (GTK_CONTAINER (notebook), vbox5); - gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (notebook), vbox5, - TRUE, TRUE, GTK_PACK_START); hbox12 = gtk_hbox_new (FALSE, 0); gtk_widget_set_name (hbox12, "hbox12"); @@ -393,13 +387,13 @@ gtk_widget_set_name (comboMRL, "comboMRL"); gtk_widget_show (comboMRL); gtk_box_pack_start (GTK_BOX (hbox12), comboMRL, TRUE, TRUE, 0); - comboMRL_items = g_list_append (comboMRL_items, (gpointer) "udp://@:1234"); - comboMRL_items = g_list_append (comboMRL_items, (gpointer) "udp6://@:1234"); - comboMRL_items = g_list_append (comboMRL_items, (gpointer) "rtp://"); - comboMRL_items = g_list_append (comboMRL_items, (gpointer) "rtp6://"); - comboMRL_items = g_list_append (comboMRL_items, (gpointer) "ftp://"); - comboMRL_items = g_list_append (comboMRL_items, (gpointer) "http://"); - comboMRL_items = g_list_append (comboMRL_items, (gpointer) "mms://"); + comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("udp://@:1234")); + comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("udp6://@:1234")); + comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("rtp://")); + comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("rtp6://")); + comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("ftp://")); + comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("http://")); + comboMRL_items = g_list_append (comboMRL_items, (gpointer) _("mms://")); gtk_combo_set_popdown_strings (GTK_COMBO (comboMRL), comboMRL_items); g_list_free (comboMRL_items); @@ -413,7 +407,7 @@ gtk_widget_set_name (hseparator15, "hseparator15"); gtk_widget_show (hseparator15); gtk_box_pack_start (GTK_BOX (vbox5), hseparator15, FALSE, FALSE, 0); - gtk_widget_set_size_request (hseparator15, -2, 10); + gtk_widget_set_size_request (hseparator15, -1, 10); table2 = gtk_table_new (6, 2, FALSE); gtk_widget_set_name (table2, "table2"); @@ -426,7 +420,6 @@ gtk_table_attach (GTK_TABLE (table2), labelNetworkPort, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelNetworkPort), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelNetworkPort), 0, 0.5); labelNetworkAddress = gtk_label_new (_("Address:")); @@ -435,7 +428,6 @@ gtk_table_attach (GTK_TABLE (table2), labelNetworkAddress, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelNetworkAddress), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelNetworkAddress), 0, 0.5); entryNetworkPort_adj = gtk_adjustment_new (1234, 0, 65535, 1, 10, 10); @@ -484,7 +476,6 @@ gtk_table_attach (GTK_TABLE (table2), labelNetworkType, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelNetworkType), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelNetworkType), 0, 0.5); comboNetworkProtocolType = gtk_combo_new (); @@ -516,7 +507,6 @@ gtk_table_attach (GTK_TABLE (table2), labelNetworkProtocol, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelNetworkProtocol), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelNetworkProtocol), 0, 0.5); labelNetworkTranscode = gtk_label_new (_("Transcode:")); @@ -525,7 +515,6 @@ gtk_table_attach (GTK_TABLE (table2), labelNetworkTranscode, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelNetworkTranscode), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelNetworkTranscode), 0, 0.5); checkNetworkTranscode = gtk_check_button_new_with_mnemonic (_("enable")); @@ -578,7 +567,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4lVideDevice, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4lVideDevice), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4lVideDevice), 0, 0.5); labelV4LAudioDevice = gtk_label_new (_("Audio:")); @@ -587,7 +575,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LAudioDevice, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LAudioDevice), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LAudioDevice), 0, 0.5); labelV4LChannel = gtk_label_new (_("Channel:")); @@ -596,7 +583,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LChannel, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LChannel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LChannel), 0, 0.5); labelV4LNorm = gtk_label_new (_("Norm:")); @@ -605,7 +591,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LNorm, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LNorm), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LNorm), 0, 0.5); labelV4LSize = gtk_label_new (_("Size:")); @@ -614,7 +599,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSize, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LSize), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LSize), 0, 0.5); labelV4LFrequency = gtk_label_new (_("Frequency:")); @@ -623,7 +607,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LFrequency, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LFrequency), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LFrequency), 0, 0.5); labelV4LSampleRate = gtk_label_new (_("Samplerate:")); @@ -632,7 +615,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSampleRate, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LSampleRate), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LSampleRate), 0, 0.5); labelV4LQuality = gtk_label_new (_("Quality:")); @@ -641,7 +623,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LQuality, 0, 1, 7, 8, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LQuality), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LQuality), 0, 0.5); labelV4LTuner = gtk_label_new (_("Tuner:")); @@ -650,7 +631,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LTuner, 0, 1, 9, 10, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LTuner), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LTuner), 0, 0.5); labelV4LSoundDirection = gtk_label_new (_("Sound:")); @@ -659,7 +639,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LSoundDirection, 0, 1, 8, 9, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LSoundDirection), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LSoundDirection), 0, 0.5); labelV4LMJPEG = gtk_label_new (_("MJPEG:")); @@ -668,7 +647,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LMJPEG, 0, 1, 10, 11, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LMJPEG), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LMJPEG), 0, 0.5); labelV4LDecimation = gtk_label_new (_("Decimation:")); @@ -677,7 +655,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LDecimation, 0, 1, 11, 12, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LDecimation), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LDecimation), 0, 0.5); comboV4lVideoDevice = gtk_combo_new (); @@ -689,9 +666,9 @@ (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), (GtkAttachOptions) (0), 0, 0); gtk_combo_set_value_in_list (GTK_COMBO (comboV4lVideoDevice), TRUE, TRUE); - comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) "/dev/video"); - comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) "/dev/video0"); - comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) "/dev/video1"); + comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) _("/dev/video")); + comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) _("/dev/video0")); + comboV4lVideoDevice_items = g_list_append (comboV4lVideoDevice_items, (gpointer) _("/dev/video1")); gtk_combo_set_popdown_strings (GTK_COMBO (comboV4lVideoDevice), comboV4lVideoDevice_items); g_list_free (comboV4lVideoDevice_items); @@ -708,10 +685,10 @@ gtk_table_attach (GTK_TABLE (tableV4L), comboV4lAudioDevice, 1, 2, 1, 2, (GtkAttachOptions) (GTK_EXPAND | GTK_SHRINK | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/dsp"); - comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/audio"); - comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/audio0"); - comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) "/dev/audio1"); + comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/dsp")); + comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/audio")); + comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/audio0")); + comboV4lAudioDevice_items = g_list_append (comboV4lAudioDevice_items, (gpointer) _("/dev/audio1")); gtk_combo_set_popdown_strings (GTK_COMBO (comboV4lAudioDevice), comboV4lAudioDevice_items); g_list_free (comboV4lAudioDevice_items); @@ -851,7 +828,6 @@ gtk_table_attach (GTK_TABLE (tableV4L), labelV4LTranscode, 0, 1, 12, 13, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelV4LTranscode), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelV4LTranscode), 0, 0.5); checkV4LTranscode = gtk_check_button_new_with_mnemonic (_("enable")); @@ -875,7 +851,6 @@ gtk_widget_set_name (Camera, "Camera"); gtk_widget_show (Camera); gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), 2), Camera); - gtk_label_set_justify (GTK_LABEL (Camera), GTK_JUSTIFY_LEFT); vbox1 = gtk_vbox_new (FALSE, 0); gtk_widget_set_name (vbox1, "vbox1"); @@ -904,7 +879,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoCodec, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelVideoCodec), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelVideoCodec), 0, 0.5); comboVideoCodec = gtk_combo_new (); @@ -936,7 +910,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoBitrate, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelVideoBitrate), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelVideoBitrate), 0, 0.5); labelVideoBitrateTolerance = gtk_label_new (_("Bitrate Tolerance:")); @@ -945,7 +918,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoBitrateTolerance, 0, 1, 2, 3, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelVideoBitrateTolerance), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelVideoBitrateTolerance), 0, 0.5); labelVideoKeyInterval = gtk_label_new (_("Keyframe Interval:")); @@ -954,7 +926,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoKeyInterval, 0, 1, 3, 4, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelVideoKeyInterval), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelVideoKeyInterval), 0, 0.5); labelAudioCodec = gtk_label_new (_("Audio Codec:")); @@ -963,7 +934,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelAudioCodec, 0, 1, 5, 6, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelAudioCodec), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelAudioCodec), 0, 0.5); labelVideoDeinterlace = gtk_label_new (_("Deinterlace:")); @@ -972,7 +942,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelVideoDeinterlace, 0, 1, 4, 5, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelVideoDeinterlace), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelVideoDeinterlace), 0, 0.5); labelStdAccess = gtk_label_new (_("Access:")); @@ -981,7 +950,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelStdAccess, 0, 1, 7, 8, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelStdAccess), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelStdAccess), 0, 0.5); labelStdMuxer = gtk_label_new (_("Muxer:")); @@ -990,7 +958,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelStdMuxer, 0, 1, 8, 9, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelStdMuxer), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelStdMuxer), 0, 0.5); labelStdUrl = gtk_label_new (_("URL:")); @@ -999,7 +966,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelStdUrl, 0, 1, 9, 10, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelStdUrl), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelStdUrl), 0, 0.5); labelStdTimeToLive = gtk_label_new (_("Time To Live (TTL):")); @@ -1008,7 +974,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelStdTimeToLive, 0, 1, 10, 11, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelStdTimeToLive), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelStdTimeToLive), 0, 0.5); entryStdTTL_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); @@ -1047,14 +1012,14 @@ gtk_table_attach (GTK_TABLE (tableTranscode), comboStdMuxer, 1, 2, 8, 9, (GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0), 0, 0); - comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("PS")); - comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("TS")); - comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MPEG1")); - comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("AVI")); - comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("OGG")); - comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MP4")); - comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("MOV")); - comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ASF")); + comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ps")); + comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ts")); + comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mpeg1")); + comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("avi")); + comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("ogg")); + comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mp4")); + comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("mov")); + comboStdMuxer_items = g_list_append (comboStdMuxer_items, (gpointer) _("asf")); gtk_combo_set_popdown_strings (GTK_COMBO (comboStdMuxer), comboStdMuxer_items); g_list_free (comboStdMuxer_items); @@ -1111,7 +1076,7 @@ (GtkAttachOptions) (0), 0, 0); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (entryVideoKeyFrameInterval), TRUE); - entryVideoBitrateTolerance_adj = gtk_adjustment_new (800000, 0, 1e+06, 1, 10, 10); + entryVideoBitrateTolerance_adj = gtk_adjustment_new (800000, 0, 1000000, 1, 10, 10); entryVideoBitrateTolerance = gtk_spin_button_new (GTK_ADJUSTMENT (entryVideoBitrateTolerance_adj), 1, 0); gtk_widget_set_name (entryVideoBitrateTolerance, "entryVideoBitrateTolerance"); gtk_widget_show (entryVideoBitrateTolerance); @@ -1137,7 +1102,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelAudioBitrate, 0, 1, 6, 7, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelAudioBitrate), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelAudioBitrate), 0, 0.5); comboStdAccess = gtk_combo_new (); @@ -1160,7 +1124,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelSAP, 0, 1, 11, 12, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelSAP), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelSAP), 0, 0.5); checkSAP = gtk_check_button_new_with_mnemonic (_("enable")); @@ -1183,7 +1146,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelSLP_, 0, 1, 12, 13, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelSLP_), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelSLP_), 0, 0.5); labelAnounceChannel = gtk_label_new (_("Announce Channel:")); @@ -1192,7 +1154,6 @@ gtk_table_attach (GTK_TABLE (tableTranscode), labelAnounceChannel, 0, 1, 13, 14, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_label_set_justify (GTK_LABEL (labelAnounceChannel), GTK_JUSTIFY_LEFT); gtk_misc_set_alignment (GTK_MISC (labelAnounceChannel), 0, 0.5); comboAnnounceChannel = gtk_combo_new (); @@ -1335,28 +1296,28 @@ gtk_widget_show (labelDescription); gtk_fixed_put (GTK_FIXED (fixed2), labelDescription, 16, 112); gtk_widget_set_size_request (labelDescription, 200, 112); - gtk_label_set_justify (GTK_LABEL (labelDescription), GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap (GTK_LABEL (labelDescription), TRUE); + labelCopyright = gtk_label_new (_("(c) 1996-2004 the VideoLAN team")); + gtk_widget_set_name (labelCopyright, "labelCopyright"); + gtk_widget_show (labelCopyright); + gtk_fixed_put (GTK_FIXED (fixed2), labelCopyright, 16, 48); + gtk_widget_set_size_request (labelCopyright, 208, 16); + gtk_label_set_justify (GTK_LABEL (labelCopyright), GTK_JUSTIFY_CENTER); + labelAuthors = gtk_label_new (_("Authors: the VideoLAN Team, http://www.videolan.org/team/")); gtk_widget_set_name (labelAuthors, "labelAuthors"); gtk_widget_show (labelAuthors); gtk_fixed_put (GTK_FIXED (fixed2), labelAuthors, 16, 72); gtk_widget_set_size_request (labelAuthors, 208, 32); - gtk_label_set_justify (GTK_LABEL (labelAuthors), GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap (GTK_LABEL (labelAuthors), TRUE); - labelCopyright = gtk_label_new (_("(c) 1996-2004 the the VideoLAN team team")); - gtk_widget_set_name (labelCopyright, "labelCopyright"); - gtk_widget_show (labelCopyright); - gtk_fixed_put (GTK_FIXED (fixed2), labelCopyright, 16, 48); - gtk_widget_set_size_request (labelCopyright, 208, 16); - labelProgramName = gtk_label_new (_("VLC media player")); gtk_widget_set_name (labelProgramName, "labelProgramName"); gtk_widget_show (labelProgramName); gtk_fixed_put (GTK_FIXED (fixed2), labelProgramName, 48, 16); gtk_widget_set_size_request (labelProgramName, 152, 16); + gtk_label_set_justify (GTK_LABEL (labelProgramName), GTK_JUSTIFY_CENTER); gtk_label_set_line_wrap (GTK_LABEL (labelProgramName), TRUE); about = gtk_label_new (_("About")); @@ -1459,12 +1420,15 @@ GLADE_HOOKUP_OBJECT_NO_REF (pda, pda, "pda"); GLADE_HOOKUP_OBJECT (pda, vbox, "vbox"); GLADE_HOOKUP_OBJECT (pda, toolbar, "toolbar"); + GLADE_HOOKUP_OBJECT (pda, separatortoolitem1, "separatortoolitem1"); GLADE_HOOKUP_OBJECT (pda, tbRewind, "tbRewind"); GLADE_HOOKUP_OBJECT (pda, tbPause, "tbPause"); GLADE_HOOKUP_OBJECT (pda, tbPlay, "tbPlay"); GLADE_HOOKUP_OBJECT (pda, tbStop, "tbStop"); GLADE_HOOKUP_OBJECT (pda, tbForward, "tbForward"); + GLADE_HOOKUP_OBJECT (pda, separatortoolitem2, "separatortoolitem2"); GLADE_HOOKUP_OBJECT (pda, tbAbout, "tbAbout"); + GLADE_HOOKUP_OBJECT (pda, toolitem1, "toolitem1"); GLADE_HOOKUP_OBJECT (pda, timeLabel, "timeLabel"); GLADE_HOOKUP_OBJECT (pda, timeSlider, "timeSlider"); GLADE_HOOKUP_OBJECT (pda, notebook, "notebook"); @@ -1599,8 +1563,8 @@ GLADE_HOOKUP_OBJECT (pda, fixed2, "fixed2"); GLADE_HOOKUP_OBJECT (pda, aboutImage, "aboutImage"); GLADE_HOOKUP_OBJECT (pda, labelDescription, "labelDescription"); - GLADE_HOOKUP_OBJECT (pda, labelAuthors, "labelAuthors"); GLADE_HOOKUP_OBJECT (pda, labelCopyright, "labelCopyright"); + GLADE_HOOKUP_OBJECT (pda, labelAuthors, "labelAuthors"); GLADE_HOOKUP_OBJECT (pda, labelProgramName, "labelProgramName"); GLADE_HOOKUP_OBJECT (pda, about, "about"); GLADE_HOOKUP_OBJECT_NO_REF (pda, tooltips, "tooltips"); diff -ur vlc-0.8.4a/modules/gui/pda/pda_support.h vlc-0.8.4a-pda/modules/gui/pda/pda_support.h --- vlc-0.8.4a/modules/gui/pda/pda_support.h 2005-12-11 22:36:19.000000000 +0100 +++ vlc-0.8.4a-pda/modules/gui/pda/pda_support.h 2006-04-05 10:50:39.000000000 +0200 @@ -15,6 +15,7 @@ # include # undef _ # define _(String) dgettext (PACKAGE, String) +# define Q_(String) g_strip_context ((String), gettext (String)) # ifdef gettext_noop # define N_(String) gettext_noop (String) # else @@ -27,6 +28,7 @@ # define dcgettext(Domain,Message,Type) (Message) # define bindtextdomain(Domain,Directory) (Domain) # define _(String) (String) +# define Q_(String) g_strip_context ((String), (String)) # define N_(String) (String) #endif