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

    Audio and Subtitles submenus into the Audio and Video menus.

diff --git a/modules/gui/gtk/gnome.glade b/modules/gui/gtk/gnome.glade
index 51ad494cf5846ad6caf37fcef92837e2d88cfa7b..f7f490eeb664e69c17f1c6e08695e01065589c9a 100644 (file)
--- a/modules/gui/gtk/gnome.glade
+++ b/modules/gui/gtk/gnome.glade
@@ -197,18 +197,6 @@
              <right_justify>False</right_justify>
            </widget>
 
-           <widget>
-             <class>GtkMenuItem</class>
-             <name>menubar_fullscreen</name>
-             <signal>
-               <name>activate</name>
-               <handler>GtkFullscreen</handler>
-               <last_modification_time>Sat, 19 May 2001 16:28:15 GMT</last_modification_time>
-             </signal>
-             <label>_Fullscreen</label>
-             <right_justify>False</right_justify>
-           </widget>
-
            <widget>
              <class>GtkMenuItem</class>
              <name>separator9</name>
@@ -301,30 +289,6 @@
            <class>GtkMenu</class>
            <name>menubar_settings_menu</name>
 
-           <widget>
-             <class>GtkMenuItem</class>
-             <name>menubar_audio</name>
-             <sensitive>False</sensitive>
-             <tooltip>Select audio channel</tooltip>
-             <label>_Audio</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>separator5</name>
-             <right_justify>False</right_justify>
-           </widget>
-
            <widget>
              <class>GtkPixmapMenuItem</class>
              <name>menubar_preferences</name>
@@ -348,6 +312,21 @@
            <class>GtkMenu</class>
            <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>separator25</name>
+             <right_justify>False</right_justify>
+           </widget>
+
            <widget>
              <class>GtkMenuItem</class>
              <name>menubar_volume_up</name>
@@ -418,8 +397,34 @@
 
            <widget>
              <class>GtkMenuItem</class>
-             <name>menubar_video_device</name>
-             <label>Screen</label>
+             <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>separator23</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>Sat, 19 May 2001 16:28:15 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>
            </widget>
 
@@ -429,6 +434,13 @@
              <label>Deinterlace</label>
              <right_justify>False</right_justify>
            </widget>
+
+           <widget>
+             <class>GtkMenuItem</class>
+             <name>menubar_video_device</name>
+             <label>Screen</label>
+             <right_justify>False</right_justify>
+           </widget>
          </widget>
        </widget>
 
@@ -1182,107 +1194,6 @@
     <right_justify>False</right_justify>
   </widget>
 
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_interface_toggle</name>
-    <signal>
-      <name>activate</name>
-      <handler>GtkWindowToggle</handler>
-      <last_modification_time>Sat, 19 May 2001 16:18:51 GMT</last_modification_time>
-    </signal>
-    <label>Toggle _Interface</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_fullscreen</name>
-    <tooltip>Toggle fullscreen mode</tooltip>
-    <signal>
-      <name>activate</name>
-      <handler>GtkFullscreen</handler>
-      <last_modification_time>Sat, 19 May 2001 16:19:07 GMT</last_modification_time>
-    </signal>
-    <label>_Fullscreen</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_video_device</name>
-    <label>Screen</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_deinterlace</name>
-    <label>Deinterlace</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>separator8</name>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_volume_up</name>
-    <signal>
-      <name>activate</name>
-      <handler>GtkVolumeUp</handler>
-      <last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
-    </signal>
-    <label>Volume Up</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_volume_down</name>
-    <signal>
-      <name>activate</name>
-      <handler>GtkVolumeDown</handler>
-      <last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
-    </signal>
-    <label>Volume Down</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_volume_mute</name>
-    <signal>
-      <name>activate</name>
-      <handler>GtkVolumeMute</handler>
-      <last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
-    </signal>
-    <label>Mute</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_audio_channels</name>
-    <label>Channels</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_audio_device</name>
-    <label>Device</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>separator17</name>
-    <right_justify>False</right_justify>
-  </widget>
-
   <widget>
     <class>GtkMenuItem</class>
     <name>popup_next</name>
@@ -1321,6 +1232,12 @@
     <stock_icon>GNOME_STOCK_MENU_JUMP_TO</stock_icon>
   </widget>
 
+  <widget>
+    <class>GtkMenuItem</class>
+    <name>separator17</name>
+    <right_justify>False</right_justify>
+  </widget>
+
   <widget>
     <class>GtkMenuItem</class>
     <name>popup_program</name>
@@ -1341,23 +1258,148 @@
   </widget>
 
   <widget>
-    <class>GtkPixmapMenuItem</class>
-    <name>popup_audio</name>
-    <sensitive>False</sensitive>
-    <tooltip>Select audio channel</tooltip>
-    <label>_Audio</label>
+    <class>GtkMenuItem</class>
+    <name>audio1</name>
+    <label>Audio</label>
     <right_justify>False</right_justify>
-    <stock_icon>GNOME_STOCK_MENU_VOLUME</stock_icon>
+
+    <widget>
+      <class>GtkMenu</class>
+      <name>audio1_menu</name>
+
+      <widget>
+       <class>GtkPixmapMenuItem</class>
+       <name>popup_audio</name>
+       <sensitive>False</sensitive>
+       <tooltip>Select audio channel</tooltip>
+       <label>_Language</label>
+       <right_justify>False</right_justify>
+       <stock_icon>GNOME_STOCK_MENU_VOLUME</stock_icon>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>separator20</name>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_volume_up</name>
+       <signal>
+         <name>activate</name>
+         <handler>GtkVolumeUp</handler>
+         <last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
+       </signal>
+       <label>Volume Up</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_volume_down</name>
+       <signal>
+         <name>activate</name>
+         <handler>GtkVolumeDown</handler>
+         <last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
+       </signal>
+       <label>Volume Down</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_volume_mute</name>
+       <signal>
+         <name>activate</name>
+         <handler>GtkVolumeMute</handler>
+         <last_modification_time>Mon, 20 Jan 2003 16:33:43 GMT</last_modification_time>
+       </signal>
+       <label>Mute</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>separator21</name>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_audio_channels</name>
+       <label>Channels</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_audio_device</name>
+       <label>Device</label>
+       <right_justify>False</right_justify>
+      </widget>
+    </widget>
   </widget>
 
   <widget>
-    <class>GtkPixmapMenuItem</class>
-    <name>popup_subpictures</name>
-    <sensitive>False</sensitive>
-    <tooltip>Select subtitles channel</tooltip>
-    <label>_Subtitles</label>
+    <class>GtkMenuItem</class>
+    <name>video1</name>
+    <label>Video</label>
     <right_justify>False</right_justify>
-    <stock_icon>GNOME_STOCK_MENU_FONT</stock_icon>
+
+    <widget>
+      <class>GtkMenu</class>
+      <name>video1_menu</name>
+
+      <widget>
+       <class>GtkPixmapMenuItem</class>
+       <name>popup_subpictures</name>
+       <sensitive>False</sensitive>
+       <tooltip>Select subtitles channel</tooltip>
+       <label>_Subtitles</label>
+       <right_justify>False</right_justify>
+       <stock_icon>GNOME_STOCK_MENU_FONT</stock_icon>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>separator18</name>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_fullscreen</name>
+       <tooltip>Toggle fullscreen mode</tooltip>
+       <signal>
+         <name>activate</name>
+         <handler>GtkFullscreen</handler>
+         <last_modification_time>Sat, 19 May 2001 16:19:07 GMT</last_modification_time>
+       </signal>
+       <label>_Fullscreen</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>separator19</name>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_deinterlace</name>
+       <label>Deinterlace</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_video_device</name>
+       <label>Screen</label>
+       <right_justify>False</right_justify>
+      </widget>
+    </widget>
   </widget>
 
   <widget>
@@ -1436,6 +1478,18 @@
     </widget>
   </widget>
 
+  <widget>
+    <class>GtkMenuItem</class>
+    <name>popup_interface_toggle</name>
+    <signal>
+      <name>activate</name>
+      <handler>GtkWindowToggle</handler>
+      <last_modification_time>Sat, 19 May 2001 16:18:51 GMT</last_modification_time>
+    </signal>
+    <label>Toggle _Interface</label>
+    <right_justify>False</right_justify>
+  </widget>
+
   <widget>
     <class>GtkMenuItem</class>
     <name>popup_playlist</name>

diff --git a/modules/gui/gtk/gnome_interface.c b/modules/gui/gtk/gnome_interface.c
index dc08b8fb8fbc4d82ba31c1a55079d58bd9661688..5815ef6ccc1781e71be91689b7b13237fa2f7ae8 100644 (file)
--- a/modules/gui/gtk/gnome_interface.c
+++ b/modules/gui/gtk/gnome_interface.c
@@ -59,13 +59,6 @@ static GnomeUIInfo menubar_view_menu_uiinfo[] =
     GNOME_APP_PIXMAP_NONE, NULL,
     0, (GdkModifierType) 0, NULL
   },
-  {
-    GNOME_APP_UI_ITEM, N_("_Fullscreen"),
-    NULL,
-    (gpointer) GtkFullscreen, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
   GNOMEUIINFO_SEPARATOR,
   {
     GNOME_APP_UI_ITEM, N_("Progr_am"),
@@ -114,28 +107,21 @@ static GnomeUIInfo menubar_view_menu_uiinfo[] =
 };
 
 static GnomeUIInfo menubar_settings_menu_uiinfo[] =
+{
+  GNOMEUIINFO_MENU_PREFERENCES_ITEM (GtkPreferencesShow, NULL),
+  GNOMEUIINFO_END
+};
+
+static GnomeUIInfo menubar_config_audio_menu_uiinfo[] =
 {
   {
-    GNOME_APP_UI_ITEM, N_("_Audio"),
+    GNOME_APP_UI_ITEM, N_("_Language"),
     N_("Select audio channel"),
     (gpointer) NULL, NULL, NULL,
     GNOME_APP_PIXMAP_NONE, NULL,
     0, (GdkModifierType) 0, NULL
   },
-  {
-    GNOME_APP_UI_ITEM, N_("_Subtitles"),
-    N_("Select subtitles channel"),
-    (gpointer) NULL, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
   GNOMEUIINFO_SEPARATOR,
-  GNOMEUIINFO_MENU_PREFERENCES_ITEM (GtkPreferencesShow, NULL),
-  GNOMEUIINFO_END
-};
-
-static GnomeUIInfo menubar_config_audio_menu_uiinfo[] =
-{
   {
     GNOME_APP_UI_ITEM, N_("Volume Up"),
     NULL,
@@ -178,12 +164,21 @@ static GnomeUIInfo menubar_config_audio_menu_uiinfo[] =
 static GnomeUIInfo menubar_config_video_menu_menu_uiinfo[] =
 {
   {
-    GNOME_APP_UI_ITEM, N_("Screen"),
-    NULL,
+    GNOME_APP_UI_ITEM, N_("_Subtitles"),
+    N_("Select subtitles channel"),
     (gpointer) NULL, NULL, NULL,
     GNOME_APP_PIXMAP_NONE, NULL,
     0, (GdkModifierType) 0, NULL
   },
+  GNOMEUIINFO_SEPARATOR,
+  {
+    GNOME_APP_UI_ITEM, N_("_Fullscreen"),
+    NULL,
+    (gpointer) GtkFullscreen, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
+  GNOMEUIINFO_SEPARATOR,
   {
     GNOME_APP_UI_ITEM, N_("Deinterlace"),
     NULL,
@@ -191,6 +186,13 @@ static GnomeUIInfo menubar_config_video_menu_menu_uiinfo[] =
     GNOME_APP_PIXMAP_NONE, NULL,
     0, (GdkModifierType) 0, NULL
   },
+  {
+    GNOME_APP_UI_ITEM, N_("Screen"),
+    NULL,
+    (gpointer) NULL, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
   GNOMEUIINFO_END
 };
 
@@ -342,52 +344,47 @@ create_intf_window (void)
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_view_menu_uiinfo[1].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_fullscreen",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator9",
                             menubar_view_menu_uiinfo[1].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_view_menu_uiinfo[2].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator9",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_program",
                             menubar_view_menu_uiinfo[2].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_sensitive (menubar_view_menu_uiinfo[2].widget, FALSE);
 
   gtk_widget_ref (menubar_view_menu_uiinfo[3].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_program",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_title",
                             menubar_view_menu_uiinfo[3].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_set_sensitive (menubar_view_menu_uiinfo[3].widget, FALSE);
 
   gtk_widget_ref (menubar_view_menu_uiinfo[4].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_title",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_chapter",
                             menubar_view_menu_uiinfo[4].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_set_sensitive (menubar_view_menu_uiinfo[4].widget, FALSE);
 
   gtk_widget_ref (menubar_view_menu_uiinfo[5].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_chapter",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator7",
                             menubar_view_menu_uiinfo[5].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_set_sensitive (menubar_view_menu_uiinfo[5].widget, FALSE);
 
   gtk_widget_ref (menubar_view_menu_uiinfo[6].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator7",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_playlist",
                             menubar_view_menu_uiinfo[6].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_view_menu_uiinfo[7].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_playlist",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_modules",
                             menubar_view_menu_uiinfo[7].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_sensitive (menubar_view_menu_uiinfo[7].widget, FALSE);
 
   gtk_widget_ref (menubar_view_menu_uiinfo[8].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_modules",
-                            menubar_view_menu_uiinfo[8].widget,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_set_sensitive (menubar_view_menu_uiinfo[8].widget, FALSE);
-
-  gtk_widget_ref (menubar_view_menu_uiinfo[9].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_messages",
-                            menubar_view_menu_uiinfo[9].widget,
+                            menubar_view_menu_uiinfo[8].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_uiinfo[2].widget);
@@ -396,25 +393,8 @@ create_intf_window (void)
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_settings_menu_uiinfo[0].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio",
-                            menubar_settings_menu_uiinfo[0].widget,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_set_sensitive (menubar_settings_menu_uiinfo[0].widget, FALSE);
-
-  gtk_widget_ref (menubar_settings_menu_uiinfo[1].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_subpictures",
-                            menubar_settings_menu_uiinfo[1].widget,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_set_sensitive (menubar_settings_menu_uiinfo[1].widget, FALSE);
-
-  gtk_widget_ref (menubar_settings_menu_uiinfo[2].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator5",
-                            menubar_settings_menu_uiinfo[2].widget,
-                            (GtkDestroyNotify) gtk_widget_unref);
-
-  gtk_widget_ref (menubar_settings_menu_uiinfo[3].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_preferences",
-                            menubar_settings_menu_uiinfo[3].widget,
+                            menubar_settings_menu_uiinfo[0].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_uiinfo[3].widget);
@@ -423,50 +403,82 @@ create_intf_window (void)
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_config_audio_menu_uiinfo[0].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_up",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio",
                             menubar_config_audio_menu_uiinfo[0].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_sensitive (menubar_config_audio_menu_uiinfo[0].widget, FALSE);
 
   gtk_widget_ref (menubar_config_audio_menu_uiinfo[1].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_down",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator25",
                             menubar_config_audio_menu_uiinfo[1].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_config_audio_menu_uiinfo[2].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_mute",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_up",
                             menubar_config_audio_menu_uiinfo[2].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_config_audio_menu_uiinfo[3].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator16",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_down",
                             menubar_config_audio_menu_uiinfo[3].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_config_audio_menu_uiinfo[4].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio_channels",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_mute",
                             menubar_config_audio_menu_uiinfo[4].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_config_audio_menu_uiinfo[5].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio_device",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator16",
                             menubar_config_audio_menu_uiinfo[5].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
+  gtk_widget_ref (menubar_config_audio_menu_uiinfo[6].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio_channels",
+                            menubar_config_audio_menu_uiinfo[6].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+
+  gtk_widget_ref (menubar_config_audio_menu_uiinfo[7].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio_device",
+                            menubar_config_audio_menu_uiinfo[7].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+
   gtk_widget_ref (menubar_uiinfo[4].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_config_video_menu",
                             menubar_uiinfo[4].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (menubar_config_video_menu_menu_uiinfo[0].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_video_device",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_subpictures",
                             menubar_config_video_menu_menu_uiinfo[0].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_sensitive (menubar_config_video_menu_menu_uiinfo[0].widget, FALSE);
 
   gtk_widget_ref (menubar_config_video_menu_menu_uiinfo[1].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_deinterlace",
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator23",
                             menubar_config_video_menu_menu_uiinfo[1].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
+  gtk_widget_ref (menubar_config_video_menu_menu_uiinfo[2].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_fullscreen",
+                            menubar_config_video_menu_menu_uiinfo[2].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+
+  gtk_widget_ref (menubar_config_video_menu_menu_uiinfo[3].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator24",
+                            menubar_config_video_menu_menu_uiinfo[3].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+
+  gtk_widget_ref (menubar_config_video_menu_menu_uiinfo[4].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_deinterlace",
+                            menubar_config_video_menu_menu_uiinfo[4].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+
+  gtk_widget_ref (menubar_config_video_menu_menu_uiinfo[5].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_video_device",
+                            menubar_config_video_menu_menu_uiinfo[5].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+
   gtk_widget_ref (menubar_uiinfo[5].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_help",
                             menubar_uiinfo[5].widget,
@@ -924,6 +936,90 @@ create_intf_window (void)
   return intf_window;
 }
 
+static GnomeUIInfo audio1_menu_uiinfo[] =
+{
+  {
+    GNOME_APP_UI_ITEM, N_("_Language"),
+    N_("Select audio channel"),
+    (gpointer) NULL, NULL, NULL,
+    GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_VOLUME,
+    0, (GdkModifierType) 0, NULL
+  },
+  GNOMEUIINFO_SEPARATOR,
+  {
+    GNOME_APP_UI_ITEM, N_("Volume Up"),
+    NULL,
+    (gpointer) GtkVolumeUp, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
+  {
+    GNOME_APP_UI_ITEM, N_("Volume Down"),
+    NULL,
+    (gpointer) GtkVolumeDown, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
+  {
+    GNOME_APP_UI_ITEM, N_("Mute"),
+    NULL,
+    (gpointer) GtkVolumeMute, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
+  GNOMEUIINFO_SEPARATOR,
+  {
+    GNOME_APP_UI_ITEM, N_("Channels"),
+    NULL,
+    (gpointer) NULL, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
+  {
+    GNOME_APP_UI_ITEM, N_("Device"),
+    NULL,
+    (gpointer) NULL, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
+  GNOMEUIINFO_END
+};
+
+static GnomeUIInfo video1_menu_uiinfo[] =
+{
+  {
+    GNOME_APP_UI_ITEM, N_("_Subtitles"),
+    N_("Select subtitles channel"),
+    (gpointer) NULL, NULL, NULL,
+    GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_FONT,
+    0, (GdkModifierType) 0, NULL
+  },
+  GNOMEUIINFO_SEPARATOR,
+  {
+    GNOME_APP_UI_ITEM, N_("_Fullscreen"),
+    N_("Toggle fullscreen mode"),
+    (gpointer) GtkFullscreen, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
+  GNOMEUIINFO_SEPARATOR,
+  {
+    GNOME_APP_UI_ITEM, N_("Deinterlace"),
+    NULL,
+    (gpointer) NULL, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
+  {
+    GNOME_APP_UI_ITEM, N_("Screen"),
+    NULL,
+    (gpointer) NULL, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
+  GNOMEUIINFO_END
+};
+
 static GnomeUIInfo popup_file_menu_uiinfo[] =
 {
   {
@@ -997,71 +1093,6 @@ static GnomeUIInfo intf_popup_uiinfo[] =
     0, (GdkModifierType) 0, NULL
   },
   GNOMEUIINFO_SEPARATOR,
-  {
-    GNOME_APP_UI_ITEM, N_("Toggle _Interface"),
-    NULL,
-    (gpointer) GtkWindowToggle, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("_Fullscreen"),
-    N_("Toggle fullscreen mode"),
-    (gpointer) GtkFullscreen, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("Screen"),
-    NULL,
-    (gpointer) NULL, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("Deinterlace"),
-    NULL,
-    (gpointer) NULL, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  GNOMEUIINFO_SEPARATOR,
-  {
-    GNOME_APP_UI_ITEM, N_("Volume Up"),
-    NULL,
-    (gpointer) GtkVolumeUp, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("Volume Down"),
-    NULL,
-    (gpointer) GtkVolumeDown, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("Mute"),
-    NULL,
-    (gpointer) GtkVolumeMute, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("Channels"),
-    NULL,
-    (gpointer) NULL, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  {
-    GNOME_APP_UI_ITEM, N_("Device"),
-    NULL,
-    (gpointer) NULL, NULL, NULL,
-    GNOME_APP_PIXMAP_NONE, NULL,
-    0, (GdkModifierType) 0, NULL
-  },
-  GNOMEUIINFO_SEPARATOR,
   {
     GNOME_APP_UI_ITEM, N_("Next"),
     NULL,
@@ -1083,6 +1114,7 @@ static GnomeUIInfo intf_popup_uiinfo[] =
     GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_JUMP_TO,
     0, (GdkModifierType) 0, NULL
   },
+  GNOMEUIINFO_SEPARATOR,
   {
     GNOME_APP_UI_ITEM, N_("Program"),
     N_("Switch program"),
@@ -1098,21 +1130,28 @@ static GnomeUIInfo intf_popup_uiinfo[] =
     0, (GdkModifierType) 0, NULL
   },
   {
-    GNOME_APP_UI_ITEM, N_("_Audio"),
-    N_("Select audio channel"),
-    (gpointer) NULL, NULL, NULL,
-    GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_VOLUME,
+    GNOME_APP_UI_SUBTREE, N_("Audio"),
+    NULL,
+    audio1_menu_uiinfo, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
     0, (GdkModifierType) 0, NULL
   },
   {
-    GNOME_APP_UI_ITEM, N_("_Subtitles"),
-    N_("Select subtitles channel"),
-    (gpointer) NULL, NULL, NULL,
-    GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_FONT,
+    GNOME_APP_UI_SUBTREE, N_("Video"),
+    NULL,
+    video1_menu_uiinfo, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
     0, (GdkModifierType) 0, NULL
   },
   GNOMEUIINFO_SEPARATOR,
   GNOMEUIINFO_MENU_FILE_TREE (popup_file_menu_uiinfo),
+  {
+    GNOME_APP_UI_ITEM, N_("Toggle _Interface"),
+    NULL,
+    (gpointer) GtkWindowToggle, NULL, NULL,
+    GNOME_APP_PIXMAP_NONE, NULL,
+    0, (GdkModifierType) 0, NULL
+  },
   {
     GNOME_APP_UI_ITEM, N_("Playlist..."),
     NULL,
@@ -1173,107 +1212,127 @@ create_intf_popup (void)
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (intf_popup_uiinfo[7].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_interface_toggle",
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_next",
                             intf_popup_uiinfo[7].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (intf_popup_uiinfo[8].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_fullscreen",
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_prev",
                             intf_popup_uiinfo[8].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (intf_popup_uiinfo[9].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_video_device",
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_jump",
                             intf_popup_uiinfo[9].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (intf_popup_uiinfo[10].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_deinterlace",
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator17",
                             intf_popup_uiinfo[10].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (intf_popup_uiinfo[11].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator8",
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_program",
                             intf_popup_uiinfo[11].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_sensitive (intf_popup_uiinfo[11].widget, FALSE);
 
   gtk_widget_ref (intf_popup_uiinfo[12].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_up",
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_navigation",
                             intf_popup_uiinfo[12].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_sensitive (intf_popup_uiinfo[12].widget, FALSE);
 
   gtk_widget_ref (intf_popup_uiinfo[13].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_down",
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "audio1",
                             intf_popup_uiinfo[13].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[14].widget);
+  gtk_widget_ref (audio1_menu_uiinfo[0].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio",
+                            audio1_menu_uiinfo[0].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_sensitive (audio1_menu_uiinfo[0].widget, FALSE);
+
+  gtk_widget_ref (audio1_menu_uiinfo[1].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator20",
+                            audio1_menu_uiinfo[1].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+
+  gtk_widget_ref (audio1_menu_uiinfo[2].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_up",
+                            audio1_menu_uiinfo[2].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+
+  gtk_widget_ref (audio1_menu_uiinfo[3].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_down",
+                            audio1_menu_uiinfo[3].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+
+  gtk_widget_ref (audio1_menu_uiinfo[4].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_mute",
-                            intf_popup_uiinfo[14].widget,
+                            audio1_menu_uiinfo[4].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[15].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio_channels",
-                            intf_popup_uiinfo[15].widget,
+  gtk_widget_ref (audio1_menu_uiinfo[5].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator21",
+                            audio1_menu_uiinfo[5].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[16].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio_device",
-                            intf_popup_uiinfo[16].widget,
+  gtk_widget_ref (audio1_menu_uiinfo[6].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio_channels",
+                            audio1_menu_uiinfo[6].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[17].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator17",
-                            intf_popup_uiinfo[17].widget,
+  gtk_widget_ref (audio1_menu_uiinfo[7].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio_device",
+                            audio1_menu_uiinfo[7].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[18].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_next",
-                            intf_popup_uiinfo[18].widget,
+  gtk_widget_ref (intf_popup_uiinfo[14].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "video1",
+                            intf_popup_uiinfo[14].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[19].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_prev",
-                            intf_popup_uiinfo[19].widget,
+  gtk_widget_ref (video1_menu_uiinfo[0].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_subpictures",
+                            video1_menu_uiinfo[0].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_set_sensitive (video1_menu_uiinfo[0].widget, FALSE);
 
-  gtk_widget_ref (intf_popup_uiinfo[20].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_jump",
-                            intf_popup_uiinfo[20].widget,
+  gtk_widget_ref (video1_menu_uiinfo[1].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator18",
+                            video1_menu_uiinfo[1].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[21].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_program",
-                            intf_popup_uiinfo[21].widget,
+  gtk_widget_ref (video1_menu_uiinfo[2].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_fullscreen",
+                            video1_menu_uiinfo[2].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_set_sensitive (intf_popup_uiinfo[21].widget, FALSE);
 
-  gtk_widget_ref (intf_popup_uiinfo[22].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_navigation",
-                            intf_popup_uiinfo[22].widget,
+  gtk_widget_ref (video1_menu_uiinfo[3].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator19",
+                            video1_menu_uiinfo[3].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_set_sensitive (intf_popup_uiinfo[22].widget, FALSE);
 
-  gtk_widget_ref (intf_popup_uiinfo[23].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio",
-                            intf_popup_uiinfo[23].widget,
+  gtk_widget_ref (video1_menu_uiinfo[4].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_deinterlace",
+                            video1_menu_uiinfo[4].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_set_sensitive (intf_popup_uiinfo[23].widget, FALSE);
 
-  gtk_widget_ref (intf_popup_uiinfo[24].widget);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_subpictures",
-                            intf_popup_uiinfo[24].widget,
+  gtk_widget_ref (video1_menu_uiinfo[5].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_video_device",
+                            video1_menu_uiinfo[5].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_set_sensitive (intf_popup_uiinfo[24].widget, FALSE);
 
-  gtk_widget_ref (intf_popup_uiinfo[25].widget);
+  gtk_widget_ref (intf_popup_uiinfo[15].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator13",
-                            intf_popup_uiinfo[25].widget,
+                            intf_popup_uiinfo[15].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[26].widget);
+  gtk_widget_ref (intf_popup_uiinfo[16].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_file",
-                            intf_popup_uiinfo[26].widget,
+                            intf_popup_uiinfo[16].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   gtk_widget_ref (popup_file_menu_uiinfo[0].widget);
@@ -1301,24 +1360,29 @@ create_intf_popup (void)
                             popup_file_menu_uiinfo[4].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[27].widget);
+  gtk_widget_ref (intf_popup_uiinfo[17].widget);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_interface_toggle",
+                            intf_popup_uiinfo[17].widget,
+                            (GtkDestroyNotify) gtk_widget_unref);
+
+  gtk_widget_ref (intf_popup_uiinfo[18].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_playlist",
-                            intf_popup_uiinfo[27].widget,
+                            intf_popup_uiinfo[18].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[28].widget);
+  gtk_widget_ref (intf_popup_uiinfo[19].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_preferences",
-                            intf_popup_uiinfo[28].widget,
+                            intf_popup_uiinfo[19].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[29].widget);
+  gtk_widget_ref (intf_popup_uiinfo[20].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator2",
-                            intf_popup_uiinfo[29].widget,
+                            intf_popup_uiinfo[20].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
-  gtk_widget_ref (intf_popup_uiinfo[30].widget);
+  gtk_widget_ref (intf_popup_uiinfo[21].widget);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_exit",
-                            intf_popup_uiinfo[30].widget,
+                            intf_popup_uiinfo[21].widget,
                             (GtkDestroyNotify) gtk_widget_unref);
 
   return intf_popup;

diff --git a/modules/gui/gtk/gtk.glade b/modules/gui/gtk/gtk.glade
index d97c1fa728ffd82dbb1c0ce59245cfa5c4ede48f..a8022323aa6e55e51f5ebd41d96e85bd67ee4fb2 100644 (file)
--- a/modules/gui/gtk/gtk.glade
+++ b/modules/gui/gtk/gtk.glade
@@ -215,18 +215,6 @@
              <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>separator13</name>
@@ -317,30 +305,6 @@
            <class>GtkMenu</class>
            <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>
              <class>GtkMenuItem</class>
              <name>menubar_preferences</name>
@@ -366,6 +330,21 @@
            <class>GtkMenu</class>
            <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>
              <class>GtkMenuItem</class>
              <name>menubar_volume_up</name>
@@ -436,8 +415,34 @@
 
            <widget>
              <class>GtkMenuItem</class>
-             <name>menubar_video_device</name>
-             <label>Screen</label>
+             <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>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>
            </widget>
 
@@ -447,6 +452,13 @@
              <label>Deinterlace</label>
              <right_justify>False</right_justify>
            </widget>
+
+           <widget>
+             <class>GtkMenuItem</class>
+             <name>menubar_video_device</name>
+             <label>Screen</label>
+             <right_justify>False</right_justify>
+           </widget>
          </widget>
        </widget>
 
@@ -1171,106 +1183,6 @@
     <right_justify>False</right_justify>
   </widget>
 
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>separator6</name>
-    <right_justify>False</right_justify>
-  </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>
-    <class>GtkMenuItem</class>
-    <name>popup_fullscreen</name>
-    <signal>
-      <name>activate</name>
-      <handler>GtkFullscreen</handler>
-      <last_modification_time>Tue, 15 May 2001 13:52:38 GMT</last_modification_time>
-    </signal>
-    <label>_Fullscreen</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_video_device</name>
-    <label>Screen</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_deinterlace</name>
-    <label>Deinterlace</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>separator5</name>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_volume_up</name>
-    <signal>
-      <name>activate</name>
-      <handler>GtkVolumeUp</handler>
-      <last_modification_time>Mon, 20 Jan 2003 10:16:02 GMT</last_modification_time>
-    </signal>
-    <label>Volume Up</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_volume_down</name>
-    <signal>
-      <name>activate</name>
-      <handler>GtkVolumeDown</handler>
-      <last_modification_time>Mon, 20 Jan 2003 10:18:25 GMT</last_modification_time>
-    </signal>
-    <label>Volume Down</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_volume_mute</name>
-    <signal>
-      <name>activate</name>
-      <handler>GtkVolumeMute</handler>
-      <last_modification_time>Mon, 20 Jan 2003 10:18:25 GMT</last_modification_time>
-    </signal>
-    <label>Mute</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_audio_channels</name>
-    <label>Channels</label>
-    <right_justify>False</right_justify>
-  </widget>
-
-  <widget>
-    <class>GtkMenuItem</class>
-    <name>popup_audio_device</name>
-    <label>Device</label>
-    <right_justify>False</right_justify>
-  </widget>
-
   <widget>
     <class>GtkMenuItem</class>
     <name>separator16</name>
@@ -1313,6 +1225,12 @@
     <right_justify>False</right_justify>
   </widget>
 
+  <widget>
+    <class>GtkMenuItem</class>
+    <name>separator27</name>
+    <right_justify>False</right_justify>
+  </widget>
+
   <widget>
     <class>GtkMenuItem</class>
     <name>popup_program</name>
@@ -1331,17 +1249,147 @@
 
   <widget>
     <class>GtkMenuItem</class>
-    <name>popup_audio</name>
-    <sensitive>False</sensitive>
-    <label>_Audio</label>
+    <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>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>separator19</name>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_volume_up</name>
+       <signal>
+         <name>activate</name>
+         <handler>GtkVolumeUp</handler>
+         <last_modification_time>Mon, 20 Jan 2003 10:16:02 GMT</last_modification_time>
+       </signal>
+       <label>Volume Up</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_volume_down</name>
+       <signal>
+         <name>activate</name>
+         <handler>GtkVolumeDown</handler>
+         <last_modification_time>Mon, 20 Jan 2003 10:18:25 GMT</last_modification_time>
+       </signal>
+       <label>Volume Down</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_volume_mute</name>
+       <signal>
+         <name>activate</name>
+         <handler>GtkVolumeMute</handler>
+         <last_modification_time>Mon, 20 Jan 2003 10:18:25 GMT</last_modification_time>
+       </signal>
+       <label>Mute</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>separator20</name>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_audio_channels</name>
+       <label>Channels</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_audio_device</name>
+       <label>Device</label>
+       <right_justify>False</right_justify>
+      </widget>
+    </widget>
   </widget>
 
   <widget>
     <class>GtkMenuItem</class>
-    <name>popup_subpictures</name>
-    <sensitive>False</sensitive>
-    <label>_Subtitles</label>
+    <name>video1</name>
+    <label>Video</label>
+    <right_justify>False</right_justify>
+
+    <widget>
+      <class>GtkMenu</class>
+      <name>video1_menu</name>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_subpictures</name>
+       <sensitive>False</sensitive>
+       <label>_Subtitles</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>separator21</name>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_fullscreen</name>
+       <signal>
+         <name>activate</name>
+         <handler>GtkFullscreen</handler>
+         <last_modification_time>Tue, 15 May 2001 13:52:38 GMT</last_modification_time>
+       </signal>
+       <label>_Fullscreen</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>separator23</name>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_deinterlace</name>
+       <label>Deinterlace</label>
+       <right_justify>False</right_justify>
+      </widget>
+
+      <widget>
+       <class>GtkMenuItem</class>
+       <name>popup_video_device</name>
+       <label>Screen</label>
+       <right_justify>False</right_justify>
+      </widget>
+    </widget>
+  </widget>
+
+  <widget>
+    <class>GtkMenuItem</class>
+    <name>separator26</name>
     <right_justify>False</right_justify>
   </widget>
 
@@ -1414,6 +1462,18 @@
     </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>
     <class>GtkMenuItem</class>
     <name>popup_playlist</name>

diff --git a/modules/gui/gtk/gtk_interface.c b/modules/gui/gtk/gtk_interface.c
index 6cd0e502fe4c729cbc1c331ae2bf90b4baa1b9d0..9314e598d9b1422317f79c80ad0f8a2cfd14273b 100644 (file)
--- a/modules/gui/gtk/gtk_interface.c
+++ b/modules/gui/gtk/gtk_interface.c
@@ -37,7 +37,6 @@ create_intf_window (void)
   GtkWidget *menubar_view_menu;
   GtkAccelGroup *menubar_view_menu_accels;
   GtkWidget *menubar_interface_hide;
-  GtkWidget *menubar_fullscreen;
   GtkWidget *separator13;
   GtkWidget *menubar_program;
   GtkWidget *menubar_title;
@@ -49,13 +48,12 @@ create_intf_window (void)
   GtkWidget *menubar_settings;
   GtkWidget *menubar_settings_menu;
   GtkAccelGroup *menubar_settings_menu_accels;
-  GtkWidget *menubar_audio;
-  GtkWidget *menubar_subpictures;
-  GtkWidget *separator8;
   GtkWidget *menubar_preferences;
   GtkWidget *menubar_config_audio;
   GtkWidget *menubar_config_audio_menu;
   GtkAccelGroup *menubar_config_audio_menu_accels;
+  GtkWidget *menubar_audio;
+  GtkWidget *separator18;
   GtkWidget *menubar_volume_up;
   GtkWidget *menubar_volume_down;
   GtkWidget *menubar_volume_mute;
@@ -65,8 +63,12 @@ create_intf_window (void)
   GtkWidget *menubar_config_video;
   GtkWidget *menubar_config_video_menu;
   GtkAccelGroup *menubar_config_video_menu_accels;
-  GtkWidget *menubar_video_device;
+  GtkWidget *menubar_subpictures;
+  GtkWidget *separator25;
+  GtkWidget *menubar_fullscreen;
+  GtkWidget *separator24;
   GtkWidget *menubar_deinterlace;
+  GtkWidget *menubar_video_device;
   GtkWidget *menubar_help;
   GtkWidget *menubar_help_menu;
   GtkAccelGroup *menubar_help_menu_accels;
@@ -296,17 +298,6 @@ create_intf_window (void)
   gtk_container_add (GTK_CONTAINER (menubar_view_menu), menubar_interface_hide);
   gtk_tooltips_set_tip (tooltips, menubar_interface_hide, _("Hide the main interface window"), NULL);
 
-  menubar_fullscreen = gtk_menu_item_new_with_label ("");
-  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_fullscreen)->child),
-                                   _("_Fullscreen"));
-  gtk_widget_add_accelerator (menubar_fullscreen, "activate_item", menubar_view_menu_accels,
-                              tmp_key, 0, 0);
-  gtk_widget_ref (menubar_fullscreen);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_fullscreen", menubar_fullscreen,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (menubar_fullscreen);
-  gtk_container_add (GTK_CONTAINER (menubar_view_menu), menubar_fullscreen);
-
   separator13 = gtk_menu_item_new ();
   gtk_widget_ref (separator13);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator13", separator13,
@@ -412,40 +403,6 @@ create_intf_window (void)
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_settings), menubar_settings_menu);
   menubar_settings_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_settings_menu));
 
-  menubar_audio = gtk_menu_item_new_with_label ("");
-  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_audio)->child),
-                                   _("A_udio"));
-  gtk_widget_add_accelerator (menubar_audio, "activate_item", menubar_settings_menu_accels,
-                              tmp_key, 0, 0);
-  gtk_widget_ref (menubar_audio);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio", menubar_audio,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (menubar_audio);
-  gtk_container_add (GTK_CONTAINER (menubar_settings_menu), menubar_audio);
-  gtk_widget_set_sensitive (menubar_audio, FALSE);
-  gtk_tooltips_set_tip (tooltips, menubar_audio, _("Select audio channel"), NULL);
-
-  menubar_subpictures = gtk_menu_item_new_with_label ("");
-  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_subpictures)->child),
-                                   _("_Subtitles"));
-  gtk_widget_add_accelerator (menubar_subpictures, "activate_item", menubar_settings_menu_accels,
-                              tmp_key, 0, 0);
-  gtk_widget_ref (menubar_subpictures);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_subpictures", menubar_subpictures,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (menubar_subpictures);
-  gtk_container_add (GTK_CONTAINER (menubar_settings_menu), menubar_subpictures);
-  gtk_widget_set_sensitive (menubar_subpictures, FALSE);
-  gtk_tooltips_set_tip (tooltips, menubar_subpictures, _("Select subtitles channel"), NULL);
-
-  separator8 = gtk_menu_item_new ();
-  gtk_widget_ref (separator8);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator8", separator8,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (separator8);
-  gtk_container_add (GTK_CONTAINER (menubar_settings_menu), separator8);
-  gtk_widget_set_sensitive (separator8, FALSE);
-
   menubar_preferences = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_preferences)->child),
                                    _("_Preferences..."));
@@ -476,6 +433,27 @@ create_intf_window (void)
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_config_audio), menubar_config_audio_menu);
   menubar_config_audio_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_config_audio_menu));
 
+  menubar_audio = gtk_menu_item_new_with_label ("");
+  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_audio)->child),
+                                   _("_Language"));
+  gtk_widget_add_accelerator (menubar_audio, "activate_item", menubar_config_audio_menu_accels,
+                              tmp_key, 0, 0);
+  gtk_widget_ref (menubar_audio);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_audio", menubar_audio,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (menubar_audio);
+  gtk_container_add (GTK_CONTAINER (menubar_config_audio_menu), menubar_audio);
+  gtk_widget_set_sensitive (menubar_audio, FALSE);
+  gtk_tooltips_set_tip (tooltips, menubar_audio, _("Select audio channel"), NULL);
+
+  separator18 = gtk_menu_item_new ();
+  gtk_widget_ref (separator18);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator18", separator18,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (separator18);
+  gtk_container_add (GTK_CONTAINER (menubar_config_audio_menu), separator18);
+  gtk_widget_set_sensitive (separator18, FALSE);
+
   menubar_volume_up = gtk_menu_item_new_with_label (_("Volume Up"));
   gtk_widget_ref (menubar_volume_up);
   gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_volume_up", menubar_volume_up,
@@ -537,12 +515,45 @@ create_intf_window (void)
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menubar_config_video), menubar_config_video_menu);
   menubar_config_video_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (menubar_config_video_menu));
 
-  menubar_video_device = gtk_menu_item_new_with_label (_("Screen"));
-  gtk_widget_ref (menubar_video_device);
-  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_video_device", menubar_video_device,
+  menubar_subpictures = gtk_menu_item_new_with_label ("");
+  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_subpictures)->child),
+                                   _("_Subtitles"));
+  gtk_widget_add_accelerator (menubar_subpictures, "activate_item", menubar_config_video_menu_accels,
+                              tmp_key, 0, 0);
+  gtk_widget_ref (menubar_subpictures);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_subpictures", menubar_subpictures,
                             (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (menubar_video_device);
-  gtk_container_add (GTK_CONTAINER (menubar_config_video_menu), menubar_video_device);
+  gtk_widget_show (menubar_subpictures);
+  gtk_container_add (GTK_CONTAINER (menubar_config_video_menu), menubar_subpictures);
+  gtk_widget_set_sensitive (menubar_subpictures, FALSE);
+  gtk_tooltips_set_tip (tooltips, menubar_subpictures, _("Select subtitles channel"), NULL);
+
+  separator25 = gtk_menu_item_new ();
+  gtk_widget_ref (separator25);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator25", separator25,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (separator25);
+  gtk_container_add (GTK_CONTAINER (menubar_config_video_menu), separator25);
+  gtk_widget_set_sensitive (separator25, FALSE);
+
+  menubar_fullscreen = gtk_menu_item_new_with_label ("");
+  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_fullscreen)->child),
+                                   _("_Fullscreen"));
+  gtk_widget_add_accelerator (menubar_fullscreen, "activate_item", menubar_config_video_menu_accels,
+                              tmp_key, 0, 0);
+  gtk_widget_ref (menubar_fullscreen);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_fullscreen", menubar_fullscreen,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (menubar_fullscreen);
+  gtk_container_add (GTK_CONTAINER (menubar_config_video_menu), menubar_fullscreen);
+
+  separator24 = gtk_menu_item_new ();
+  gtk_widget_ref (separator24);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "separator24", separator24,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (separator24);
+  gtk_container_add (GTK_CONTAINER (menubar_config_video_menu), separator24);
+  gtk_widget_set_sensitive (separator24, FALSE);
 
   menubar_deinterlace = gtk_menu_item_new_with_label (_("Deinterlace"));
   gtk_widget_ref (menubar_deinterlace);
@@ -551,6 +562,13 @@ create_intf_window (void)
   gtk_widget_show (menubar_deinterlace);
   gtk_container_add (GTK_CONTAINER (menubar_config_video_menu), menubar_deinterlace);
 
+  menubar_video_device = gtk_menu_item_new_with_label (_("Screen"));
+  gtk_widget_ref (menubar_video_device);
+  gtk_object_set_data_full (GTK_OBJECT (intf_window), "menubar_video_device", menubar_video_device,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (menubar_video_device);
+  gtk_container_add (GTK_CONTAINER (menubar_config_video_menu), menubar_video_device);
+
   menubar_help = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (menubar_help)->child),
                                    _("_Help"));
@@ -966,9 +984,6 @@ create_intf_window (void)
   gtk_signal_connect (GTK_OBJECT (menubar_interface_hide), "activate",
                       GTK_SIGNAL_FUNC (GtkWindowToggle),
                       NULL);
-  gtk_signal_connect (GTK_OBJECT (menubar_fullscreen), "activate",
-                      GTK_SIGNAL_FUNC (GtkFullscreen),
-                      NULL);
   gtk_signal_connect (GTK_OBJECT (menubar_playlist), "activate",
                       GTK_SIGNAL_FUNC (GtkPlaylistShow),
                       NULL);
@@ -990,6 +1005,9 @@ create_intf_window (void)
   gtk_signal_connect (GTK_OBJECT (menubar_volume_mute), "activate",
                       GTK_SIGNAL_FUNC (GtkVolumeMute),
                       NULL);
+  gtk_signal_connect (GTK_OBJECT (menubar_fullscreen), "activate",
+                      GTK_SIGNAL_FUNC (GtkFullscreen),
+                      NULL);
   gtk_signal_connect (GTK_OBJECT (menubar_about), "activate",
                       GTK_SIGNAL_FUNC (GtkAboutShow),
                       NULL);
@@ -1079,25 +1097,34 @@ create_intf_popup (void)
   GtkWidget *popup_back;
   GtkWidget *popup_slow;
   GtkWidget *popup_fast;
-  GtkWidget *separator6;
-  GtkWidget *popup_interface_toggle;
-  GtkWidget *popup_fullscreen;
-  GtkWidget *popup_video_device;
-  GtkWidget *popup_deinterlace;
-  GtkWidget *separator5;
-  GtkWidget *popup_volume_up;
-  GtkWidget *popup_volume_down;
-  GtkWidget *popup_volume_mute;
-  GtkWidget *popup_audio_channels;
-  GtkWidget *popup_audio_device;
   GtkWidget *separator16;
   GtkWidget *popup_next;
   GtkWidget *popup_prev;
   GtkWidget *popup_jump;
+  GtkWidget *separator27;
   GtkWidget *popup_program;
   GtkWidget *popup_navigation;
+  GtkWidget *audio1;
+  GtkWidget *audio1_menu;
+  GtkAccelGroup *audio1_menu_accels;
   GtkWidget *popup_audio;
+  GtkWidget *separator19;
+  GtkWidget *popup_volume_up;
+  GtkWidget *popup_volume_down;
+  GtkWidget *popup_volume_mute;
+  GtkWidget *separator20;
+  GtkWidget *popup_audio_channels;
+  GtkWidget *popup_audio_device;
+  GtkWidget *video1;
+  GtkWidget *video1_menu;
+  GtkAccelGroup *video1_menu_accels;
   GtkWidget *popup_subpictures;
+  GtkWidget *separator21;
+  GtkWidget *popup_fullscreen;
+  GtkWidget *separator23;
+  GtkWidget *popup_deinterlace;
+  GtkWidget *popup_video_device;
+  GtkWidget *separator26;
   GtkWidget *popup_open;
   GtkWidget *popup_open_menu;
   GtkAccelGroup *popup_open_menu_accels;
@@ -1106,6 +1133,7 @@ create_intf_popup (void)
   GtkWidget *popup_network;
   GtkWidget *separator12;
   GtkWidget *popup_about;
+  GtkWidget *popup_interface_toggle;
   GtkWidget *popup_playlist;
   GtkWidget *popup_preferences;
   GtkWidget *separator9;
@@ -1168,93 +1196,6 @@ create_intf_popup (void)
   gtk_container_add (GTK_CONTAINER (intf_popup), popup_fast);
   gtk_widget_set_sensitive (popup_fast, FALSE);
 
-  separator6 = gtk_menu_item_new ();
-  gtk_widget_ref (separator6);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator6", separator6,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (separator6);
-  gtk_container_add (GTK_CONTAINER (intf_popup), separator6);
-  gtk_widget_set_sensitive (separator6, FALSE);
-
-  popup_interface_toggle = gtk_menu_item_new_with_label ("");
-  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_interface_toggle)->child),
-                                   _("Toggle _Interface"));
-  gtk_widget_add_accelerator (popup_interface_toggle, "activate_item", intf_popup_accels,
-                              tmp_key, 0, 0);
-  gtk_widget_ref (popup_interface_toggle);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_interface_toggle", popup_interface_toggle,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (popup_interface_toggle);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_interface_toggle);
-
-  popup_fullscreen = gtk_menu_item_new_with_label ("");
-  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_fullscreen)->child),
-                                   _("_Fullscreen"));
-  gtk_widget_add_accelerator (popup_fullscreen, "activate_item", intf_popup_accels,
-                              tmp_key, 0, 0);
-  gtk_widget_ref (popup_fullscreen);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_fullscreen", popup_fullscreen,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (popup_fullscreen);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_fullscreen);
-
-  popup_video_device = gtk_menu_item_new_with_label (_("Screen"));
-  gtk_widget_ref (popup_video_device);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_video_device", popup_video_device,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (popup_video_device);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_video_device);
-
-  popup_deinterlace = gtk_menu_item_new_with_label (_("Deinterlace"));
-  gtk_widget_ref (popup_deinterlace);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_deinterlace", popup_deinterlace,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (popup_deinterlace);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_deinterlace);
-
-  separator5 = gtk_menu_item_new ();
-  gtk_widget_ref (separator5);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator5", separator5,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (separator5);
-  gtk_container_add (GTK_CONTAINER (intf_popup), separator5);
-  gtk_widget_set_sensitive (separator5, FALSE);
-
-  popup_volume_up = gtk_menu_item_new_with_label (_("Volume Up"));
-  gtk_widget_ref (popup_volume_up);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_up", popup_volume_up,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (popup_volume_up);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_volume_up);
-
-  popup_volume_down = gtk_menu_item_new_with_label (_("Volume Down"));
-  gtk_widget_ref (popup_volume_down);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_down", popup_volume_down,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (popup_volume_down);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_volume_down);
-
-  popup_volume_mute = gtk_menu_item_new_with_label (_("Mute"));
-  gtk_widget_ref (popup_volume_mute);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_mute", popup_volume_mute,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (popup_volume_mute);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_volume_mute);
-
-  popup_audio_channels = gtk_menu_item_new_with_label (_("Channels"));
-  gtk_widget_ref (popup_audio_channels);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio_channels", popup_audio_channels,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (popup_audio_channels);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_audio_channels);
-
-  popup_audio_device = gtk_menu_item_new_with_label (_("Device"));
-  gtk_widget_ref (popup_audio_device);
-  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio_device", popup_audio_device,
-                            (GtkDestroyNotify) gtk_widget_unref);
-  gtk_widget_show (popup_audio_device);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_audio_device);
-
   separator16 = gtk_menu_item_new ();
   gtk_widget_ref (separator16);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator16", separator16,
@@ -1288,6 +1229,14 @@ create_intf_popup (void)
   gtk_widget_show (popup_jump);
   gtk_container_add (GTK_CONTAINER (intf_popup), popup_jump);
 
+  separator27 = gtk_menu_item_new ();
+  gtk_widget_ref (separator27);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator27", separator27,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (separator27);
+  gtk_container_add (GTK_CONTAINER (intf_popup), separator27);
+  gtk_widget_set_sensitive (separator27, FALSE);
+
   popup_program = gtk_menu_item_new_with_label (_("Program"));
   gtk_widget_ref (popup_program);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_program", popup_program,
@@ -1308,30 +1257,158 @@ create_intf_popup (void)
   gtk_container_add (GTK_CONTAINER (intf_popup), popup_navigation);
   gtk_widget_set_sensitive (popup_navigation, FALSE);
 
+  audio1 = gtk_menu_item_new_with_label (_("Audio"));
+  gtk_widget_ref (audio1);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "audio1", audio1,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (audio1);
+  gtk_container_add (GTK_CONTAINER (intf_popup), audio1);
+
+  audio1_menu = gtk_menu_new ();
+  gtk_widget_ref (audio1_menu);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "audio1_menu", audio1_menu,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (audio1), audio1_menu);
+  audio1_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (audio1_menu));
+
   popup_audio = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_audio)->child),
-                                   _("_Audio"));
-  gtk_widget_add_accelerator (popup_audio, "activate_item", intf_popup_accels,
+                                   _("_Language"));
+  gtk_widget_add_accelerator (popup_audio, "activate_item", audio1_menu_accels,
                               tmp_key, 0, 0);
   gtk_widget_ref (popup_audio);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio", popup_audio,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (popup_audio);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_audio);
+  gtk_container_add (GTK_CONTAINER (audio1_menu), popup_audio);
   gtk_widget_set_sensitive (popup_audio, FALSE);
 
+  separator19 = gtk_menu_item_new ();
+  gtk_widget_ref (separator19);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator19", separator19,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (separator19);
+  gtk_container_add (GTK_CONTAINER (audio1_menu), separator19);
+  gtk_widget_set_sensitive (separator19, FALSE);
+
+  popup_volume_up = gtk_menu_item_new_with_label (_("Volume Up"));
+  gtk_widget_ref (popup_volume_up);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_up", popup_volume_up,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (popup_volume_up);
+  gtk_container_add (GTK_CONTAINER (audio1_menu), popup_volume_up);
+
+  popup_volume_down = gtk_menu_item_new_with_label (_("Volume Down"));
+  gtk_widget_ref (popup_volume_down);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_down", popup_volume_down,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (popup_volume_down);
+  gtk_container_add (GTK_CONTAINER (audio1_menu), popup_volume_down);
+
+  popup_volume_mute = gtk_menu_item_new_with_label (_("Mute"));
+  gtk_widget_ref (popup_volume_mute);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_volume_mute", popup_volume_mute,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (popup_volume_mute);
+  gtk_container_add (GTK_CONTAINER (audio1_menu), popup_volume_mute);
+
+  separator20 = gtk_menu_item_new ();
+  gtk_widget_ref (separator20);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator20", separator20,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (separator20);
+  gtk_container_add (GTK_CONTAINER (audio1_menu), separator20);
+  gtk_widget_set_sensitive (separator20, FALSE);
+
+  popup_audio_channels = gtk_menu_item_new_with_label (_("Channels"));
+  gtk_widget_ref (popup_audio_channels);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio_channels", popup_audio_channels,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (popup_audio_channels);
+  gtk_container_add (GTK_CONTAINER (audio1_menu), popup_audio_channels);
+
+  popup_audio_device = gtk_menu_item_new_with_label (_("Device"));
+  gtk_widget_ref (popup_audio_device);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_audio_device", popup_audio_device,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (popup_audio_device);
+  gtk_container_add (GTK_CONTAINER (audio1_menu), popup_audio_device);
+
+  video1 = gtk_menu_item_new_with_label (_("Video"));
+  gtk_widget_ref (video1);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "video1", video1,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (video1);
+  gtk_container_add (GTK_CONTAINER (intf_popup), video1);
+
+  video1_menu = gtk_menu_new ();
+  gtk_widget_ref (video1_menu);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "video1_menu", video1_menu,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (video1), video1_menu);
+  video1_menu_accels = gtk_menu_ensure_uline_accel_group (GTK_MENU (video1_menu));
+
   popup_subpictures = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_subpictures)->child),
                                    _("_Subtitles"));
-  gtk_widget_add_accelerator (popup_subpictures, "activate_item", intf_popup_accels,
+  gtk_widget_add_accelerator (popup_subpictures, "activate_item", video1_menu_accels,
                               tmp_key, 0, 0);
   gtk_widget_ref (popup_subpictures);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_subpictures", popup_subpictures,
                             (GtkDestroyNotify) gtk_widget_unref);
   gtk_widget_show (popup_subpictures);
-  gtk_container_add (GTK_CONTAINER (intf_popup), popup_subpictures);
+  gtk_container_add (GTK_CONTAINER (video1_menu), popup_subpictures);
   gtk_widget_set_sensitive (popup_subpictures, FALSE);
 
+  separator21 = gtk_menu_item_new ();
+  gtk_widget_ref (separator21);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator21", separator21,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (separator21);
+  gtk_container_add (GTK_CONTAINER (video1_menu), separator21);
+  gtk_widget_set_sensitive (separator21, FALSE);
+
+  popup_fullscreen = gtk_menu_item_new_with_label ("");
+  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_fullscreen)->child),
+                                   _("_Fullscreen"));
+  gtk_widget_add_accelerator (popup_fullscreen, "activate_item", video1_menu_accels,
+                              tmp_key, 0, 0);
+  gtk_widget_ref (popup_fullscreen);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_fullscreen", popup_fullscreen,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (popup_fullscreen);
+  gtk_container_add (GTK_CONTAINER (video1_menu), popup_fullscreen);
+
+  separator23 = gtk_menu_item_new ();
+  gtk_widget_ref (separator23);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator23", separator23,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (separator23);
+  gtk_container_add (GTK_CONTAINER (video1_menu), separator23);
+  gtk_widget_set_sensitive (separator23, FALSE);
+
+  popup_deinterlace = gtk_menu_item_new_with_label (_("Deinterlace"));
+  gtk_widget_ref (popup_deinterlace);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_deinterlace", popup_deinterlace,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (popup_deinterlace);
+  gtk_container_add (GTK_CONTAINER (video1_menu), popup_deinterlace);
+
+  popup_video_device = gtk_menu_item_new_with_label (_("Screen"));
+  gtk_widget_ref (popup_video_device);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_video_device", popup_video_device,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (popup_video_device);
+  gtk_container_add (GTK_CONTAINER (video1_menu), popup_video_device);
+
+  separator26 = gtk_menu_item_new ();
+  gtk_widget_ref (separator26);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "separator26", separator26,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (separator26);
+  gtk_container_add (GTK_CONTAINER (intf_popup), separator26);
+  gtk_widget_set_sensitive (separator26, FALSE);
+
   popup_open = gtk_menu_item_new_with_label ("");
   tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_open)->child),
                                    _("_File"));
@@ -1405,6 +1482,17 @@ create_intf_popup (void)
   gtk_widget_show (popup_about);
   gtk_container_add (GTK_CONTAINER (popup_open_menu), popup_about);
 
+  popup_interface_toggle = gtk_menu_item_new_with_label ("");
+  tmp_key = gtk_label_parse_uline (GTK_LABEL (GTK_BIN (popup_interface_toggle)->child),
+                                   _("Toggle _Interface"));
+  gtk_widget_add_accelerator (popup_interface_toggle, "activate_item", intf_popup_accels,
+                              tmp_key, 0, 0);
+  gtk_widget_ref (popup_interface_toggle);
+  gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_interface_toggle", popup_interface_toggle,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (popup_interface_toggle);
+  gtk_container_add (GTK_CONTAINER (intf_popup), popup_interface_toggle);
+
   popup_playlist = gtk_menu_item_new_with_label (_("Playlist..."));
   gtk_widget_ref (popup_playlist);
   gtk_object_set_data_full (GTK_OBJECT (intf_popup), "popup_playlist", popup_playlist,
@@ -1460,11 +1548,14 @@ create_intf_popup (void)
   gtk_signal_connect (GTK_OBJECT (popup_fast), "activate",
                       GTK_SIGNAL_FUNC (GtkControlFast),
                       NULL);
-  gtk_signal_connect (GTK_OBJECT (popup_interface_toggle), "activate",
-                      GTK_SIGNAL_FUNC (GtkWindowToggle),
+  gtk_signal_connect (GTK_OBJECT (popup_next), "activate",
+                      GTK_SIGNAL_FUNC (GtkPlaylistNext),
                       NULL);
-  gtk_signal_connect (GTK_OBJECT (popup_fullscreen), "activate",
-                      GTK_SIGNAL_FUNC (GtkFullscreen),
+  gtk_signal_connect (GTK_OBJECT (popup_prev), "activate",
+                      GTK_SIGNAL_FUNC (GtkPlaylistPrev),
+                      NULL);
+  gtk_signal_connect (GTK_OBJECT (popup_jump), "activate",
+                      GTK_SIGNAL_FUNC (GtkJumpShow),
                       NULL);
   gtk_signal_connect (GTK_OBJECT (popup_volume_up), "activate",
                       GTK_SIGNAL_FUNC (GtkVolumeUp),
@@ -1475,14 +1566,8 @@ create_intf_popup (void)
   gtk_signal_connect (GTK_OBJECT (popup_volume_mute), "activate",
                       GTK_SIGNAL_FUNC (GtkVolumeMute),
                       NULL);
-  gtk_signal_connect (GTK_OBJECT (popup_next), "activate",
-                      GTK_SIGNAL_FUNC (GtkPlaylistNext),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (popup_prev), "activate",
-                      GTK_SIGNAL_FUNC (GtkPlaylistPrev),
-                      NULL);
-  gtk_signal_connect (GTK_OBJECT (popup_jump), "activate",
-                      GTK_SIGNAL_FUNC (GtkJumpShow),
+  gtk_signal_connect (GTK_OBJECT (popup_fullscreen), "activate",
+                      GTK_SIGNAL_FUNC (GtkFullscreen),
                       NULL);
   gtk_signal_connect (GTK_OBJECT (popup_file), "activate",
                       GTK_SIGNAL_FUNC (GtkFileOpenShow),
@@ -1496,6 +1581,9 @@ create_intf_popup (void)
   gtk_signal_connect (GTK_OBJECT (popup_about), "activate",
                       GTK_SIGNAL_FUNC (GtkAboutShow),
                       NULL);
+  gtk_signal_connect (GTK_OBJECT (popup_interface_toggle), "activate",
+                      GTK_SIGNAL_FUNC (GtkWindowToggle),
+                      NULL);
   gtk_signal_connect (GTK_OBJECT (popup_playlist), "activate",
                       GTK_SIGNAL_FUNC (GtkPlaylistShow),
                       NULL);