Skip to content

V
vlc
Commit 1584d670 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./modules/gui/gtk/gnome.glade, ./modules/gui/gtk/gtk.glade: we disable 

    the title and chapter dialogs when DVD menus are activated.
parent e15a35bf
Hide whitespace changes
Inline Side-by-side
Showing with 423 additions and 387 deletions
doc/fortunes.txt
View file @ 1584d670
......@@ -436,3 +436,10 @@ the Boston strangler is to the woman home alone.
-- #videolan
%
<BeKavlie> seriously though, out of curiosity: why are people working on
VideoLAN? It can't be to keep us BeOS people happy ;-)
<jlj> world domination
<jlj> didn't you get the memo ?
-- #videolan
%
modules/gui/gtk/gnome.glade
View file @ 1584d670
......@@ -1781,101 +1781,12 @@ http://www.videolan.org/
<class>GtkTable</class>
<name>table5</name>
<border_width>5</border_width>
<rows>4</rows>
<rows>5</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>5</row_spacing>
<column_spacing>5</column_spacing>
<widget>
<class>GtkLabel</class>
<name>label21</name>
<label>Title</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label20</name>
<label>Chapter</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>disc_chapter</name>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 09 Jul 2002 13:45:38 GMT</last_modification_time>
</signal>
<climb_rate>1</climb_rate>
<digits>0</digits>
<numeric>False</numeric>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>0</value>
<lower>0</lower>
<upper>65536</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label35</name>
......@@ -1961,25 +1872,6 @@ http://www.videolan.org/
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkCheckButton</class>
<name>disc_dvd_use_menu</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 21 Jan 2003 13:39:20 GMT</last_modification_time>
</signal>
<label>Use DVD menus</label>
<active>True</active>
<draw_indicator>True</draw_indicator>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
<widget>
......@@ -2008,6 +1900,115 @@ http://www.videolan.org/
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>disc_name</name>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 09 Jul 2002 13:46:05 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text>/dev/dvd</text>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>disc_chapter_label</name>
<label>Chapter</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>4</top_attach>
<bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>disc_title_label</name>
<label>Title</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkCheckButton</class>
<name>disc_dvd_use_menu</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 21 Jan 2003 13:39:20 GMT</last_modification_time>
</signal>
<label>Use DVD menus</label>
<active>True</active>
<draw_indicator>True</draw_indicator>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>disc_title</name>
......@@ -2023,8 +2024,8 @@ http://www.videolan.org/
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>0</value>
<lower>0</lower>
<value>1</value>
<lower>1</lower>
<upper>65536</upper>
<step>1</step>
<page>10</page>
......@@ -2032,8 +2033,8 @@ http://www.videolan.org/
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
......@@ -2046,23 +2047,31 @@ http://www.videolan.org/
</widget>
<widget>
<class>GtkEntry</class>
<name>disc_name</name>
<class>GtkSpinButton</class>
<name>disc_chapter</name>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 09 Jul 2002 13:46:05 GMT</last_modification_time>
<last_modification_time>Tue, 09 Jul 2002 13:45:38 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text>/dev/dvd</text>
<climb_rate>1</climb_rate>
<digits>0</digits>
<numeric>False</numeric>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>1</value>
<lower>1</lower>
<upper>65536</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<top_attach>4</top_attach>
<bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
......
modules/gui/gtk/gnome_interface.c
View file @ 1584d670
......@@ -1365,20 +1365,20 @@ create_intf_open (void)
GtkWidget *open_browse;
GtkWidget *open_file;
GtkWidget *table5;
GtkWidget *label21;
GtkWidget *label20;
GtkObject *disc_chapter_adj;
GtkWidget *disc_chapter;
GtkWidget *label35;
GtkWidget *hbox24;
GSList *disc_group = NULL;
GtkWidget *disc_dvd;
GtkWidget *disc_vcd;
GtkWidget *disc_dvd_use_menu;
GtkWidget *label19;
GtkWidget *disc_name;
GtkWidget *disc_chapter_label;
GtkWidget *disc_title_label;
GtkWidget *disc_dvd_use_menu;
GtkObject *disc_title_adj;
GtkWidget *disc_title;
GtkWidget *disc_name;
GtkObject *disc_chapter_adj;
GtkWidget *disc_chapter;
GtkWidget *open_disc;
GtkWidget *table4;
GSList *table4_group = NULL;
......@@ -1557,7 +1557,7 @@ create_intf_open (void)
gtk_widget_show (open_file);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (open_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (open_notebook), 0), open_file);
table5 = gtk_table_new (4, 2, FALSE);
table5 = gtk_table_new (5, 2, FALSE);
gtk_widget_ref (table5);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "table5", table5,
(GtkDestroyNotify) gtk_widget_unref);
......@@ -1567,36 +1567,6 @@ create_intf_open (void)
gtk_table_set_row_spacings (GTK_TABLE (table5), 5);
gtk_table_set_col_spacings (GTK_TABLE (table5), 5);
label21 = gtk_label_new (_("Title"));
gtk_widget_ref (label21);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "label21", label21,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (label21);
gtk_table_attach (GTK_TABLE (table5), label21, 0, 1, 2, 3,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label21), 0, 0.5);
label20 = gtk_label_new (_("Chapter"));
gtk_widget_ref (label20);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "label20", label20,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (label20);
gtk_table_attach (GTK_TABLE (table5), label20, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label20), 0, 0.5);
disc_chapter_adj = gtk_adjustment_new (0, 0, 65536, 1, 10, 10);
disc_chapter = gtk_spin_button_new (GTK_ADJUSTMENT (disc_chapter_adj), 1, 0);
gtk_widget_ref (disc_chapter);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_chapter", disc_chapter,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_chapter);
gtk_table_attach (GTK_TABLE (table5), disc_chapter, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
label35 = gtk_label_new (_("Disc type"));
gtk_widget_ref (label35);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "label35", label35,
......@@ -1632,14 +1602,6 @@ create_intf_open (void)
gtk_widget_show (disc_vcd);
gtk_box_pack_start (GTK_BOX (hbox24), disc_vcd, FALSE, FALSE, 0);
disc_dvd_use_menu = gtk_check_button_new_with_label (_("Use DVD menus"));
gtk_widget_ref (disc_dvd_use_menu);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_dvd_use_menu", disc_dvd_use_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_dvd_use_menu);
gtk_box_pack_start (GTK_BOX (hbox24), disc_dvd_use_menu, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (disc_dvd_use_menu), TRUE);
label19 = gtk_label_new (_("Device name"));
gtk_widget_ref (label19);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "label19", label19,
......@@ -1649,25 +1611,65 @@ create_intf_open (void)
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
disc_title_adj = gtk_adjustment_new (0, 0, 65536, 1, 10, 10);
disc_name = gtk_entry_new ();
gtk_widget_ref (disc_name);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_name", disc_name,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_name);
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");
disc_chapter_label = gtk_label_new (_("Chapter"));
gtk_widget_ref (disc_chapter_label);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_chapter_label", disc_chapter_label,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_chapter_label);
gtk_table_attach (GTK_TABLE (table5), disc_chapter_label, 0, 1, 4, 5,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (disc_chapter_label), 0, 0.5);
disc_title_label = gtk_label_new (_("Title"));
gtk_widget_ref (disc_title_label);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_title_label", disc_title_label,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_title_label);
gtk_table_attach (GTK_TABLE (table5), disc_title_label, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (disc_title_label), 0, 0.5);
disc_dvd_use_menu = gtk_check_button_new_with_label (_("Use DVD menus"));
gtk_widget_ref (disc_dvd_use_menu);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_dvd_use_menu", disc_dvd_use_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_dvd_use_menu);
gtk_table_attach (GTK_TABLE (table5), disc_dvd_use_menu, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (disc_dvd_use_menu), TRUE);
disc_title_adj = gtk_adjustment_new (1, 1, 65536, 1, 10, 10);
disc_title = gtk_spin_button_new (GTK_ADJUSTMENT (disc_title_adj), 1, 0);
gtk_widget_ref (disc_title);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_title", disc_title,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_title);
gtk_table_attach (GTK_TABLE (table5), disc_title, 1, 2, 2, 3,
gtk_table_attach (GTK_TABLE (table5), disc_title, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
disc_name = gtk_entry_new ();
gtk_widget_ref (disc_name);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_name", disc_name,
disc_chapter_adj = gtk_adjustment_new (1, 1, 65536, 1, 10, 10);
disc_chapter = gtk_spin_button_new (GTK_ADJUSTMENT (disc_chapter_adj), 1, 0);
gtk_widget_ref (disc_chapter);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_chapter", disc_chapter,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_name);
gtk_table_attach (GTK_TABLE (table5), disc_name, 1, 2, 1, 2,
gtk_widget_show (disc_chapter);
gtk_table_attach (GTK_TABLE (table5), disc_chapter, 1, 2, 4, 5,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_entry_set_text (GTK_ENTRY (disc_name), "/dev/dvd");
open_disc = gtk_label_new (_("Disc"));
gtk_widget_ref (open_disc);
......@@ -2125,22 +2127,22 @@ create_intf_open (void)
gtk_signal_connect (GTK_OBJECT (open_browse), "clicked",
GTK_SIGNAL_FUNC (GtkFileShow),
"entry_file");
gtk_signal_connect (GTK_OBJECT (disc_chapter), "changed",
GTK_SIGNAL_FUNC (GtkOpenChanged),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_dvd), "toggled",
GTK_SIGNAL_FUNC (GtkDiscOpenDvd),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_vcd), "toggled",
GTK_SIGNAL_FUNC (GtkDiscOpenVcd),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_name), "changed",
GTK_SIGNAL_FUNC (GtkOpenChanged),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_dvd_use_menu), "toggled",
GTK_SIGNAL_FUNC (GtkOpenChanged),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_title), "changed",
GTK_SIGNAL_FUNC (GtkOpenChanged),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_name), "changed",
gtk_signal_connect (GTK_OBJECT (disc_chapter), "changed",
GTK_SIGNAL_FUNC (GtkOpenChanged),
NULL);
gtk_signal_connect (GTK_OBJECT (network_udp), "toggled",
......
modules/gui/gtk/gtk.glade
View file @ 1584d670
......@@ -1931,101 +1931,12 @@ http://www.videolan.org/</label>
<class>GtkTable</class>
<name>table5</name>
<border_width>5</border_width>
<rows>4</rows>
<rows>5</rows>
<columns>2</columns>
<homogeneous>False</homogeneous>
<row_spacing>5</row_spacing>
<column_spacing>5</column_spacing>
<widget>
<class>GtkLabel</class>
<name>label21</name>
<label>Title</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label20</name>
<label>Chapter</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>disc_chapter</name>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 09 Jul 2002 13:45:38 GMT</last_modification_time>
</signal>
<climb_rate>1</climb_rate>
<digits>0</digits>
<numeric>False</numeric>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>0</value>
<lower>0</lower>
<upper>65536</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label35</name>
......@@ -2111,25 +2022,6 @@ http://www.videolan.org/</label>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkCheckButton</class>
<name>disc_dvd_use_menu</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 21 Jan 2003 13:27:40 GMT</last_modification_time>
</signal>
<label>Use DVD menus</label>
<active>True</active>
<draw_indicator>True</draw_indicator>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
</widget>
<widget>
......@@ -2138,7 +2030,7 @@ http://www.videolan.org/</label>
<label>Device name</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
......@@ -2158,6 +2050,87 @@ http://www.videolan.org/</label>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>disc_chapter_label</name>
<label>Chapter</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>4</top_attach>
<bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>disc_title_label</name>
<label>Title</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<left_attach>0</left_attach>
<right_attach>1</right_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkEntry</class>
<name>disc_name</name>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 09 Jul 2002 13:46:05 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text>/dev/dvd</text>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkSpinButton</class>
<name>disc_title</name>
......@@ -2173,8 +2146,8 @@ http://www.videolan.org/</label>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>0</value>
<lower>0</lower>
<value>1</value>
<lower>1</lower>
<upper>65536</upper>
<step>1</step>
<page>10</page>
......@@ -2182,8 +2155,8 @@ http://www.videolan.org/</label>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<top_attach>3</top_attach>
<bottom_attach>4</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
......@@ -2196,23 +2169,59 @@ http://www.videolan.org/</label>
</widget>
<widget>
<class>GtkEntry</class>
<name>disc_name</name>
<class>GtkSpinButton</class>
<name>disc_chapter</name>
<can_focus>True</can_focus>
<signal>
<name>changed</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 09 Jul 2002 13:46:05 GMT</last_modification_time>
<last_modification_time>Tue, 09 Jul 2002 13:45:38 GMT</last_modification_time>
</signal>
<editable>True</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
<text>/dev/dvd</text>
<climb_rate>1</climb_rate>
<digits>0</digits>
<numeric>False</numeric>
<update_policy>GTK_UPDATE_ALWAYS</update_policy>
<snap>False</snap>
<wrap>False</wrap>
<value>1</value>
<lower>1</lower>
<upper>65536</upper>
<step>1</step>
<page>10</page>
<page_size>10</page_size>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>1</top_attach>
<bottom_attach>2</bottom_attach>
<top_attach>4</top_attach>
<bottom_attach>5</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
<yexpand>False</yexpand>
<xshrink>False</xshrink>
<yshrink>False</yshrink>
<xfill>True</xfill>
<yfill>False</yfill>
</child>
</widget>
<widget>
<class>GtkCheckButton</class>
<name>disc_dvd_use_menu</name>
<can_focus>True</can_focus>
<signal>
<name>toggled</name>
<handler>GtkOpenChanged</handler>
<last_modification_time>Tue, 21 Jan 2003 13:27:40 GMT</last_modification_time>
</signal>
<label>Use DVD menus</label>
<active>False</active>
<draw_indicator>True</draw_indicator>
<child>
<left_attach>1</left_attach>
<right_attach>2</right_attach>
<top_attach>2</top_attach>
<bottom_attach>3</bottom_attach>
<xpad>0</xpad>
<ypad>0</ypad>
<xexpand>False</xexpand>
......
modules/gui/gtk/gtk_interface.c
View file @ 1584d670
......@@ -1629,20 +1629,20 @@ create_intf_open (void)
GtkWidget *open_browse;
GtkWidget *open_file;
GtkWidget *table5;
GtkWidget *label21;
GtkWidget *label20;
GtkObject *disc_chapter_adj;
GtkWidget *disc_chapter;
GtkWidget *label35;
GtkWidget *hbox24;
GSList *disc_group = NULL;
GtkWidget *disc_dvd;
GtkWidget *disc_vcd;
GtkWidget *disc_dvd_use_menu;
GtkWidget *label19;
GtkWidget *disc_chapter_label;
GtkWidget *disc_title_label;
GtkWidget *disc_name;
GtkObject *disc_title_adj;
GtkWidget *disc_title;
GtkWidget *disc_name;
GtkObject *disc_chapter_adj;
GtkWidget *disc_chapter;
GtkWidget *disc_dvd_use_menu;
GtkWidget *open_disc;
GtkWidget *table4;
GSList *table4_group = NULL;
......@@ -1829,7 +1829,7 @@ create_intf_open (void)
gtk_widget_show (open_file);
gtk_notebook_set_tab_label (GTK_NOTEBOOK (open_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (open_notebook), 0), open_file);
table5 = gtk_table_new (4, 2, FALSE);
table5 = gtk_table_new (5, 2, FALSE);
gtk_widget_ref (table5);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "table5", table5,
(GtkDestroyNotify) gtk_widget_unref);
......@@ -1839,36 +1839,6 @@ create_intf_open (void)
gtk_table_set_row_spacings (GTK_TABLE (table5), 5);
gtk_table_set_col_spacings (GTK_TABLE (table5), 5);
label21 = gtk_label_new (_("Title"));
gtk_widget_ref (label21);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "label21", label21,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (label21);
gtk_table_attach (GTK_TABLE (table5), label21, 0, 1, 2, 3,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label21), 0, 0.5);
label20 = gtk_label_new (_("Chapter"));
gtk_widget_ref (label20);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "label20", label20,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (label20);
gtk_table_attach (GTK_TABLE (table5), label20, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label20), 0, 0.5);
disc_chapter_adj = gtk_adjustment_new (0, 0, 65536, 1, 10, 10);
disc_chapter = gtk_spin_button_new (GTK_ADJUSTMENT (disc_chapter_adj), 1, 0);
gtk_widget_ref (disc_chapter);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_chapter", disc_chapter,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_chapter);
gtk_table_attach (GTK_TABLE (table5), disc_chapter, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
label35 = gtk_label_new (_("Disc type"));
gtk_widget_ref (label35);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "label35", label35,
......@@ -1904,14 +1874,6 @@ create_intf_open (void)
gtk_widget_show (disc_vcd);
gtk_box_pack_start (GTK_BOX (hbox24), disc_vcd, FALSE, FALSE, 0);
disc_dvd_use_menu = gtk_check_button_new_with_label (_("Use DVD menus"));
gtk_widget_ref (disc_dvd_use_menu);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_dvd_use_menu", disc_dvd_use_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_dvd_use_menu);
gtk_box_pack_start (GTK_BOX (hbox24), disc_dvd_use_menu, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (disc_dvd_use_menu), TRUE);
label19 = gtk_label_new (_("Device name"));
gtk_widget_ref (label19);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "label19", label19,
......@@ -1920,16 +1882,27 @@ create_intf_open (void)
gtk_table_attach (GTK_TABLE (table5), label19, 0, 1, 1, 2,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (label19), 0, 0.5);
disc_title_adj = gtk_adjustment_new (0, 0, 65536, 1, 10, 10);
disc_title = gtk_spin_button_new (GTK_ADJUSTMENT (disc_title_adj), 1, 0);
gtk_widget_ref (disc_title);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_title", disc_title,
disc_chapter_label = gtk_label_new (_("Chapter"));
gtk_widget_ref (disc_chapter_label);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_chapter_label", disc_chapter_label,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_title);
gtk_table_attach (GTK_TABLE (table5), disc_title, 1, 2, 2, 3,
gtk_widget_show (disc_chapter_label);
gtk_table_attach (GTK_TABLE (table5), disc_chapter_label, 0, 1, 4, 5,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (disc_chapter_label), 0, 0.5);
disc_title_label = gtk_label_new (_("Title"));
gtk_widget_ref (disc_title_label);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_title_label", disc_title_label,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_title_label);
gtk_table_attach (GTK_TABLE (table5), disc_title_label, 0, 1, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
gtk_misc_set_alignment (GTK_MISC (disc_title_label), 0, 0.5);
disc_name = gtk_entry_new ();
gtk_widget_ref (disc_name);
......@@ -1941,6 +1914,35 @@ create_intf_open (void)
(GtkAttachOptions) (0), 0, 0);
gtk_entry_set_text (GTK_ENTRY (disc_name), "/dev/dvd");
disc_title_adj = gtk_adjustment_new (1, 1, 65536, 1, 10, 10);
disc_title = gtk_spin_button_new (GTK_ADJUSTMENT (disc_title_adj), 1, 0);
gtk_widget_ref (disc_title);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_title", disc_title,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_title);
gtk_table_attach (GTK_TABLE (table5), disc_title, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
disc_chapter_adj = gtk_adjustment_new (1, 1, 65536, 1, 10, 10);
disc_chapter = gtk_spin_button_new (GTK_ADJUSTMENT (disc_chapter_adj), 1, 0);
gtk_widget_ref (disc_chapter);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_chapter", disc_chapter,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_chapter);
gtk_table_attach (GTK_TABLE (table5), disc_chapter, 1, 2, 4, 5,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
disc_dvd_use_menu = gtk_check_button_new_with_label (_("Use DVD menus"));
gtk_widget_ref (disc_dvd_use_menu);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "disc_dvd_use_menu", disc_dvd_use_menu,
(GtkDestroyNotify) gtk_widget_unref);
gtk_widget_show (disc_dvd_use_menu);
gtk_table_attach (GTK_TABLE (table5), disc_dvd_use_menu, 1, 2, 2, 3,
(GtkAttachOptions) (GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
open_disc = gtk_label_new (_("Disc"));
gtk_widget_ref (open_disc);
gtk_object_set_data_full (GTK_OBJECT (intf_open), "open_disc", open_disc,
......@@ -2420,22 +2422,22 @@ create_intf_open (void)
gtk_signal_connect (GTK_OBJECT (open_browse), "clicked",
GTK_SIGNAL_FUNC (GtkFileShow),
"entry_file");
gtk_signal_connect (GTK_OBJECT (disc_chapter), "changed",
GTK_SIGNAL_FUNC (GtkOpenChanged),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_dvd), "toggled",
GTK_SIGNAL_FUNC (GtkDiscOpenDvd),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_vcd), "toggled",
GTK_SIGNAL_FUNC (GtkDiscOpenVcd),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_dvd_use_menu), "toggled",
gtk_signal_connect (GTK_OBJECT (disc_name), "changed",
GTK_SIGNAL_FUNC (GtkOpenChanged),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_title), "changed",
GTK_SIGNAL_FUNC (GtkOpenChanged),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_name), "changed",
gtk_signal_connect (GTK_OBJECT (disc_chapter), "changed",
GTK_SIGNAL_FUNC (GtkOpenChanged),
NULL);
gtk_signal_connect (GTK_OBJECT (disc_dvd_use_menu), "toggled",
GTK_SIGNAL_FUNC (GtkOpenChanged),
NULL);
gtk_signal_connect (GTK_OBJECT (network_udp), "toggled",
......
modules/gui/gtk/open.c
View file @ 1584d670
......@@ -2,16 +2,16 @@
* gtk_open.c : functions to handle file/disc/network open widgets.
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: open.c,v 1.12 2003/01/29 17:28:22 gbazin Exp $
* $Id: open.c,v 1.13 2003/01/29 18:10:52 sam Exp $
*
* Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr>
*
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
......@@ -177,12 +177,18 @@ void GtkDiscOpenVcd( GtkToggleButton * togglebutton, gpointer user_data )
static void GtkDiscOpenChanged( GtkWidget * button, gpointer user_data )
{
GString * p_target = g_string_new( "" );
int i_title, i_chapter;
GtkWidget * p_open;
vlc_bool_t b_menus = VLC_FALSE;
p_open = gtk_widget_get_toplevel( GTK_WIDGET (button) );
if( GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button),
if( GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button),
"disc_dvd" ) )->active )
{
if( GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button), "disc_dvd_use_menu" ) )->active )
b_menus = GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET(button),
"disc_dvd_use_menu" ) )->active;
if( b_menus )
{
g_string_append( p_target, "dvd://" );
}
......@@ -195,31 +201,32 @@ static void GtkDiscOpenChanged( GtkWidget * button, gpointer user_data )
"disc_vcd" ) )->active )
{
g_string_append( p_target, "vcd://" );
}
}
g_string_append( p_target,
gtk_entry_get_text( GTK_ENTRY( lookup_widget(
GTK_WIDGET(button), "disc_name" ) ) ) );
i_title = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON( lookup_widget( GTK_WIDGET(button),
"disc_title" ) ) );
i_chapter = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON( lookup_widget( GTK_WIDGET(button),
"disc_chapter" ) ) );
if( i_title )
if( !b_menus )
{
if( i_chapter )
g_string_sprintfa( p_target, "@%i,%i", i_title, i_chapter );
else
g_string_sprintfa( p_target, "@%i", i_title );
}
else
{
if( i_chapter )
g_string_sprintfa( p_target, "@,%i", i_chapter );
g_string_sprintfa( p_target, "@%i,%i",
gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON( lookup_widget(
GTK_WIDGET(button), "disc_title" ) ) ),
gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON( lookup_widget(
GTK_WIDGET(button), "disc_chapter" ) ) ) );
}
gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_open ),
"disc_title_label" ), !b_menus );
gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_open ),
"disc_title" ), !b_menus );
gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_open ),
"disc_chapter_label" ), !b_menus );
gtk_widget_set_sensitive( gtk_object_get_data( GTK_OBJECT( p_open ),
"disc_chapter" ), !b_menus );
gtk_entry_set_text( GTK_ENTRY( lookup_widget(
GTK_WIDGET(button), "entry_open" ) ),
p_target->str );
......@@ -383,7 +390,7 @@ void GtkNetworkOpenChannel( GtkToggleButton *togglebutton,
void GtkNetworkOpenHTTP( GtkToggleButton *togglebutton,
gpointer user_data )
{
{
GtkWidget * p_open;
p_open = gtk_widget_get_toplevel( GTK_WIDGET (togglebutton) );
......@@ -420,7 +427,7 @@ static void GtkSatOpenChanged( GtkWidget * button, gpointer user_data )
GTK_WIDGET(button), "sat_freq" ) ) ),
!GTK_TOGGLE_BUTTON( lookup_widget( GTK_WIDGET( button ),
"sat_pol_vert" ) )->active,
strtol( gtk_entry_get_text( GTK_ENTRY( GTK_COMBO(
strtol( gtk_entry_get_text( GTK_ENTRY( GTK_COMBO(
lookup_widget( GTK_WIDGET( button ), "sat_fec" )
)->entry ) ), NULL, 10 ),
gtk_spin_button_get_value_as_int(
......@@ -690,7 +697,7 @@ void GtkOpenOk( GtkButton * button, gpointer user_data )
gtk_widget_hide( GTK_WIDGET( p_channel ) );
}
}
}
void GtkOpenCancel( GtkButton * button, gpointer user_data )
......
toolbox
View file @ 1584d670
#! /bin/sh
## toolbox for vlc, the VideoLAN Client
## $Id: toolbox,v 1.7 2003/01/28 20:02:03 sam Exp $
## $Id: toolbox,v 1.8 2003/01/29 18:10:52 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -22,7 +22,7 @@ help()
recognized flags are:
--update-vc update Microsoft Visual Studio files
--update-po update translation files
--fix-glade fix Glade-generated files
--update-glade generate and fix Glade code
EOF
exit 1
}
......@@ -44,7 +44,7 @@ while test $# -gt 0; do
do_help=no
do_po=yes
;;
--fix-glade)
--update-glade|--fix-glade)
do_help=no
do_glade=yes
;;
......
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