[MPlayer-cvslog] r38034 - trunk/gui/dialog/menu.c

[ib]

Author: ib
Date: Tue Apr  3 19:57:08 2018
New Revision: 38034

Log:
Move menu item "Drop subtitle".

Remove it from the group of open menu items and place it at the end of
the group of subtitle menu items.

Additionally, disable it unless a "droppable" subtitle (like a srt file)
is currently selected as active subtitle.

Modified:
   trunk/gui/dialog/menu.c

Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c	Tue Apr  3 19:42:41 2018	(r38033)
+++ trunk/gui/dialog/menu.c	Tue Apr  3 19:57:08 2018	(r38034)
@@ -572,7 +572,6 @@ GtkWidget * CreatePopUpMenu( void )
     AddSeparator( SubMenu );
     AddMenuItem( window1, (const char*)loadeaf_xpm, SubMenu,MSGTR_GUI_AudioTrack"...", evLoadAudioFile );
     AddMenuItem( window1, (const char*)sub_xpm, SubMenu,MSGTR_GUI_Subtitle"...   ", evLoadSubtitle );
-    AddMenuItem( window1, (const char*)nosub_xpm, SubMenu,MSGTR_GUI_DropSubtitle,evDropSubtitle );
    SubMenu=AddSubMenu(window1, (const char*)play_xpm, Menu,MSGTR_GUI_Playback );
     AddMenuItem( window1, (const char*)play_xpm, SubMenu,MSGTR_GUI_Play"        ", evPlay );
     AddMenuItem( window1, (const char*)pause_xpm, SubMenu,MSGTR_GUI_Pause, evPause );
@@ -834,6 +833,8 @@ GtkWidget * CreatePopUpMenu( void )
      }
    }
 
+  if ( subdata ) AddMenuItem( window1, (const char*)nosub_xpm, Menu,MSGTR_GUI_DropSubtitle,evDropSubtitle );
+
   AddSeparator( Menu );
   AddMenuItem( window1, (const char*)equalizer_xpm, Menu,MSGTR_GUI_Equalizer, evEqualizer );
   AddMenuItem( window1, (const char*)skin_xpm, Menu,MSGTR_GUI_SkinBrowser, evSkinBrowser );