Skip to content

V
vlc-2-2
Commit 618ae596 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* modules/gui/gtk/*: fixed gtk/gnome.glade and re-run ./toolbox --update-glade.
parent e434b3f0
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 25 deletions
modules/gui/gtk/gnome.glade
View file @ 618ae596
......@@ -1359,7 +1359,7 @@
<widget>
<class>GtkPixmapMenuItem</class>
<name>popup_disc</name>
<tooltip>Open a DVD or VCD</tooltip>
<tooltip>Open Disc Media</tooltip>
<signal>
<name>activate</name>
<handler>GtkDiscOpenShow</handler>
......
modules/gui/gtk/gnome_interface.c
View file @ 618ae596
/*
* DO NOT EDIT THIS FILE - it is generated by Glade.
*/
/* This file was created automatically by glade and fixed by bootstrap */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <vlc/vlc.h>
#include <sys/types.h>
#include <sys/stat.h>
......@@ -683,7 +679,7 @@ create_intf_window (void)
gtk_widget_show (vbox8);
gnome_app_set_contents (GNOME_APP (intf_window), vbox8);
slider_frame = gtk_frame_new (_("-:--:--"));
slider_frame = gtk_frame_new ("-:--:--");
gtk_widget_ref (slider_frame);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "slider_frame", slider_frame,
(GtkDestroyNotify) gtk_widget_unref);
......@@ -740,7 +736,7 @@ create_intf_window (void)
gtk_widget_show (label19);
gtk_box_pack_start (GTK_BOX (title_chapter_box), label19, FALSE, FALSE, 0);
title_label = gtk_label_new (_("--"));
title_label = gtk_label_new ("--");
gtk_widget_ref (title_label);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "title_label", title_label,
(GtkDestroyNotify) gtk_widget_unref);
......@@ -783,7 +779,7 @@ create_intf_window (void)
gtk_widget_show (label20);
gtk_box_pack_start (GTK_BOX (dvd_chapter_box), label20, FALSE, FALSE, 0);
chapter_label = gtk_label_new (_("---"));
chapter_label = gtk_label_new ("---");
gtk_widget_ref (chapter_label);
gtk_object_set_data_full (GTK_OBJECT (intf_window), "chapter_label", chapter_label,
(GtkDestroyNotify) gtk_widget_unref);
......@@ -1648,7 +1644,7 @@ create_intf_open (void)
gtk_table_attach (GTK_TABLE (table5), disc_name, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_entry_set_text (GTK_ENTRY (disc_name), _("/dev/dvd"));
gtk_entry_set_text (GTK_ENTRY (disc_name), "/dev/dvd");
disc_chapter_label = gtk_label_new (_("Chapter"));
gtk_widget_ref (disc_chapter_label);
......@@ -1950,12 +1946,12 @@ create_intf_open (void)
gtk_table_attach (GTK_TABLE (table3), sat_fec, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
sat_fec_items = g_list_append (sat_fec_items, (gpointer) _("1/2"));
sat_fec_items = g_list_append (sat_fec_items, (gpointer) _("2/3"));
sat_fec_items = g_list_append (sat_fec_items, (gpointer) _("3/4"));
sat_fec_items = g_list_append (sat_fec_items, (gpointer) _("4/5"));
sat_fec_items = g_list_append (sat_fec_items, (gpointer) _("5/6"));
sat_fec_items = g_list_append (sat_fec_items, (gpointer) _("7/8"));
sat_fec_items = g_list_append (sat_fec_items, (gpointer) "1/2");
sat_fec_items = g_list_append (sat_fec_items, (gpointer) "2/3");
sat_fec_items = g_list_append (sat_fec_items, (gpointer) "3/4");
sat_fec_items = g_list_append (sat_fec_items, (gpointer) "4/5");
sat_fec_items = g_list_append (sat_fec_items, (gpointer) "5/6");
sat_fec_items = g_list_append (sat_fec_items, (gpointer) "7/8");
gtk_combo_set_popdown_strings (GTK_COMBO (sat_fec), sat_fec_items);
g_list_free (sat_fec_items);
......@@ -1964,7 +1960,7 @@ create_intf_open (void)
gtk_object_set_data_full (GTK_OBJECT (intf_open), "combo_entry1", combo_entry1,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (combo_entry1);
gtk_entry_set_text (GTK_ENTRY (combo_entry1), _("3/4"));
gtk_entry_set_text (GTK_ENTRY (combo_entry1), "3/4");
open_sat = gtk_label_new (_("Satellite"));
gtk_widget_ref (open_sat);
......
modules/gui/gtk/gtk.glade
View file @ 618ae596
......@@ -96,7 +96,7 @@
<widget>
<class>GtkMenuItem</class>
<name>menubar_disc</name>
<tooltip>Open a DVD or VCD</tooltip>
<tooltip>Open Disc Media</tooltip>
<accelerator>
<modifiers>0</modifiers>
<key>GDK_F4</key>
......@@ -529,7 +529,7 @@
<class>GtkButton</class>
<child_name>Toolbar:button</child_name>
<name>toolbar_disc</name>
<tooltip>Open a DVD or VCD</tooltip>
<tooltip>Open Disc Media</tooltip>
<signal>
<name>clicked</name>
<handler>GtkDiscOpenShow</handler>
......@@ -1344,7 +1344,7 @@
<widget>
<class>GtkMenuItem</class>
<name>popup_disc</name>
<tooltip>Open a DVD or VCD</tooltip>
<tooltip>Open Disc Media</tooltip>
<signal>
<name>activate</name>
<handler>GtkDiscOpenShow</handler>
......@@ -2035,6 +2035,26 @@
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkRadioButton</class>
<name>disc_cdda</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>GtkDiscOpenCDDA</handler>
<last_modification_time>Sun, 13 May 2001 14:48:39 GMT</last_modification_time>
</signal>
<label>Audio CD</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<group>disc</group>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
<widget>
......
modules/gui/gtk/gtk_interface.c
View file @ 618ae596
......@@ -185,7 +185,7 @@ create_intf_window (void)
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (menubar_disc);
gtk_container_add (GTK_CONTAINER (menubar_file_menu), menubar_disc);
gtk_tooltips_set_tip (tooltips, menubar_disc, _("Open a DVD or VCD"), NULL);
gtk_tooltips_set_tip (tooltips, menubar_disc, _("Open Disc Media"), NULL);
gtk_widget_add_accelerator (menubar_disc, "activate", accel_group,
GDK_F4, 0,
GTK_ACCEL_VISIBLE);
......@@ -1914,7 +1914,7 @@ create_intf_open (void)
gtk_object_set_data_full (GTK_OBJECT (intf_open), "hbox24", hbox24,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (hbox24);
gtk_table_attach (GTK_TABLE (table5), hbox24, 1, 3, 0, 1,
gtk_table_attach (GTK_TABLE (table5), hbox24, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (GTK_FILL), 0, 0);
......@@ -2198,7 +2198,7 @@ create_intf_open (void)
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label26), 0, 0.5);
sat_freq_adj = gtk_adjustment_new (11954000, 10000000, 12999000, 1, 10, 10);
sat_freq_adj = gtk_adjustment_new (1.1954e+07, 1e+07, 1.2999e+07, 1, 10, 10);
sat_freq = gtk_spin_button_new (GTK_ADJUSTMENT (sat_freq_adj), 1, 0);
gtk_widget_ref (sat_freq);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "sat_freq", sat_freq,
......@@ -2243,7 +2243,7 @@ create_intf_open (void)
gtk_widget_show (sat_pol_hor);
gtk_box_pack_start (GTK_BOX (hbox23), sat_pol_hor, FALSE, FALSE, 0);
sat_srate_adj = gtk_adjustment_new (27500000, 1000000, 30000000, 1, 10, 10);
sat_srate_adj = gtk_adjustment_new (2.75e+07, 1e+06, 3e+07, 1, 10, 10);
sat_srate = gtk_spin_button_new (GTK_ADJUSTMENT (sat_srate_adj), 1, 0);
gtk_widget_ref (sat_srate);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "sat_srate", sat_srate,
......
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