Skip to content

V
vlc-2-2
Commit d8d83737 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

* ./modules/gui/gtk/gnome.glade, ./modules/gui/gtk/gtk.glade: moved the 

    Audio and Subtitles submenus into the Audio and Video menus.
parent 05422a3f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 926 additions and 660 deletions
modules/gui/gtk/gnome.glade
View file @ d8d83737
This diff is collapsed.
modules/gui/gtk/gnome_interface.c
View file @ d8d83737
This diff is collapsed.
modules/gui/gtk/gtk.glade
View file @ d8d83737
...@@ -215,18 +215,6 @@ ...@@ -215,18 +215,6 @@
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_fullscreen</name>
<signal>
<name>activate</name>
<handler>GtkFullscreen</handler>
<last_modification_time>Mon, 14 May 2001 21:29:21 GMT</last_modification_time>
</signal>
<label>_Fullscreen</label>
<right_justify>False</right_justify>
</widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>separator13</name> <name>separator13</name>
...@@ -317,30 +305,6 @@ ...@@ -317,30 +305,6 @@
<class>GtkMenu</class> <class>GtkMenu</class>
<name>menubar_settings_menu</name> <name>menubar_settings_menu</name>
<widget>
<class>GtkMenuItem</class>
<name>menubar_audio</name>
<sensitive>False</sensitive>
<tooltip>Select audio channel</tooltip>
<label>A_udio</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_subpictures</name>
<sensitive>False</sensitive>
<tooltip>Select subtitles channel</tooltip>
<label>_Subtitles</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator8</name>
<right_justify>False</right_justify>
</widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>menubar_preferences</name> <name>menubar_preferences</name>
...@@ -366,6 +330,21 @@ ...@@ -366,6 +330,21 @@
<class>GtkMenu</class> <class>GtkMenu</class>
<name>menubar_config_audio_menu</name> <name>menubar_config_audio_menu</name>
<widget>
<class>GtkMenuItem</class>
<name>menubar_audio</name>
<sensitive>False</sensitive>
<tooltip>Select audio channel</tooltip>
<label>_Language</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator18</name>
<right_justify>False</right_justify>
</widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>menubar_volume_up</name> <name>menubar_volume_up</name>
...@@ -436,8 +415,34 @@ ...@@ -436,8 +415,34 @@
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>menubar_video_device</name> <name>menubar_subpictures</name>
<label>Screen</label> <sensitive>False</sensitive>
<tooltip>Select subtitles channel</tooltip>
<label>_Subtitles</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator25</name>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_fullscreen</name>
<signal>
<name>activate</name>
<handler>GtkFullscreen</handler>
<last_modification_time>Mon, 14 May 2001 21:29:21 GMT</last_modification_time>
</signal>
<label>_Fullscreen</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator24</name>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
...@@ -447,6 +452,13 @@ ...@@ -447,6 +452,13 @@
<label>Deinterlace</label> <label>Deinterlace</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget>
<class>GtkMenuItem</class>
<name>menubar_video_device</name>
<label>Screen</label>
<right_justify>False</right_justify>
</widget>
</widget> </widget>
</widget> </widget>
...@@ -1173,51 +1185,89 @@ ...@@ -1173,51 +1185,89 @@
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>separator6</name> <name>separator16</name>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_interface_toggle</name> <name>popup_next</name>
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkWindowToggle</handler> <handler>GtkPlaylistNext</handler>
<last_modification_time>Tue, 15 May 2001 13:53:00 GMT</last_modification_time> <last_modification_time>Tue, 15 May 2001 13:52:31 GMT</last_modification_time>
</signal> </signal>
<label>Toggle _Interface</label> <label>Next</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_fullscreen</name> <name>popup_prev</name>
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkFullscreen</handler> <handler>GtkPlaylistPrev</handler>
<last_modification_time>Tue, 15 May 2001 13:52:38 GMT</last_modification_time> <last_modification_time>Tue, 15 May 2001 13:52:23 GMT</last_modification_time>
</signal> </signal>
<label>_Fullscreen</label> <label>Prev</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_video_device</name> <name>popup_jump</name>
<label>Screen</label> <signal>
<name>activate</name>
<handler>GtkJumpShow</handler>
<last_modification_time>Tue, 15 May 2001 13:52:13 GMT</last_modification_time>
</signal>
<label>_Jump...</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_deinterlace</name> <name>separator27</name>
<label>Deinterlace</label> <right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_program</name>
<sensitive>False</sensitive>
<label>Program</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_navigation</name>
<sensitive>False</sensitive>
<label>_Navigation</label>
<right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>audio1</name>
<label>Audio</label>
<right_justify>False</right_justify>
<widget>
<class>GtkMenu</class>
<name>audio1_menu</name>
<widget>
<class>GtkMenuItem</class>
<name>popup_audio</name>
<sensitive>False</sensitive>
<label>_Language</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>separator5</name> <name>separator19</name>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
...@@ -1257,6 +1307,12 @@ ...@@ -1257,6 +1307,12 @@
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget>
<class>GtkMenuItem</class>
<name>separator20</name>
<right_justify>False</right_justify>
</widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_audio_channels</name> <name>popup_audio_channels</name>
...@@ -1270,78 +1326,70 @@ ...@@ -1270,78 +1326,70 @@
<label>Device</label> <label>Device</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
</widget>
</widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>separator16</name> <name>video1</name>
<label>Video</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget>
<widget>
<class>GtkMenu</class>
<name>video1_menu</name>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_next</name> <name>popup_subpictures</name>
<signal> <sensitive>False</sensitive>
<name>activate</name> <label>_Subtitles</label>
<handler>GtkPlaylistNext</handler>
<last_modification_time>Tue, 15 May 2001 13:52:31 GMT</last_modification_time>
</signal>
<label>Next</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_prev</name> <name>separator21</name>
<signal>
<name>activate</name>
<handler>GtkPlaylistPrev</handler>
<last_modification_time>Tue, 15 May 2001 13:52:23 GMT</last_modification_time>
</signal>
<label>Prev</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_jump</name> <name>popup_fullscreen</name>
<signal> <signal>
<name>activate</name> <name>activate</name>
<handler>GtkJumpShow</handler> <handler>GtkFullscreen</handler>
<last_modification_time>Tue, 15 May 2001 13:52:13 GMT</last_modification_time> <last_modification_time>Tue, 15 May 2001 13:52:38 GMT</last_modification_time>
</signal> </signal>
<label>_Jump...</label> <label>_Fullscreen</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_program</name> <name>separator23</name>
<sensitive>False</sensitive>
<label>Program</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_navigation</name> <name>popup_deinterlace</name>
<sensitive>False</sensitive> <label>Deinterlace</label>
<label>_Navigation</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_audio</name> <name>popup_video_device</name>
<sensitive>False</sensitive> <label>Screen</label>
<label>_Audio</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
</widget>
</widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_subpictures</name> <name>separator26</name>
<sensitive>False</sensitive>
<label>_Subtitles</label>
<right_justify>False</right_justify> <right_justify>False</right_justify>
</widget> </widget>
...@@ -1414,6 +1462,18 @@ ...@@ -1414,6 +1462,18 @@
</widget> </widget>
</widget> </widget>
<widget>
<class>GtkMenuItem</class>
<name>popup_interface_toggle</name>
<signal>
<name>activate</name>
<handler>GtkWindowToggle</handler>
<last_modification_time>Tue, 15 May 2001 13:53:00 GMT</last_modification_time>
</signal>
<label>Toggle _Interface</label>
<right_justify>False</right_justify>
</widget>
<widget> <widget>
<class>GtkMenuItem</class> <class>GtkMenuItem</class>
<name>popup_playlist</name> <name>popup_playlist</name>
......
modules/gui/gtk/gtk_interface.c
View file @ d8d83737
This diff is collapsed.
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