Commit 5c3f46de authored by Sam Hocevar's avatar Sam Hocevar

* ./plugins/gtk/gtk_display.c, ./plugins/win32/mainframe.cpp: we deactivate

    popup menus when no stream is being played, even in network mode.
parent fc00a930
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
HEAD HEAD
* ./plugins/gtk/gtk_display.c, ./plugins/win32/mainframe.cpp: we deactivate
popup menus when no stream is being played, even in network mode.
* ./src/input/mpeg_system.c: removed unnecessarily verbose message. * ./src/input/mpeg_system.c: removed unnecessarily verbose message.
* ./src/video_output/video_output.c: fixed the "picture has invalid status" * ./src/video_output/video_output.c: fixed the "picture has invalid status"
bug which might have been the cause of crashes. bug which might have been the cause of crashes.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* gtk_display.c: Gtk+ tools for main interface * gtk_display.c: Gtk+ tools for main interface
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: gtk_display.c,v 1.22 2002/05/30 08:17:04 gbazin Exp $ * $Id: gtk_display.c,v 1.22.2.1 2002/06/02 11:55:32 sam Exp $
* *
* Authors: Samuel Hocevar <sam@zoy.org> * Authors: Samuel Hocevar <sam@zoy.org>
* Stphane Borel <stef@via.ecp.fr> * Stphane Borel <stef@via.ecp.fr>
...@@ -209,6 +209,7 @@ gint GtkModeManage( intf_thread_t * p_intf ) ...@@ -209,6 +209,7 @@ gint GtkModeManage( intf_thread_t * p_intf )
GTK_OBJECT( p_intf->p_sys->p_window ), "label_status" ); GTK_OBJECT( p_intf->p_sys->p_window ), "label_status" );
gtk_label_set_text( GTK_LABEL( p_label ), "" ); gtk_label_set_text( GTK_LABEL( p_label ), "" );
gtk_widget_show( GTK_WIDGET( p_file_box ) ); gtk_widget_show( GTK_WIDGET( p_file_box ) );
}
/* unsensitize menus */ /* unsensitize menus */
gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_program"), gtk_widget_set_sensitive( GETWIDGET(p_window,"menubar_program"),
...@@ -225,7 +226,6 @@ gint GtkModeManage( intf_thread_t * p_intf ) ...@@ -225,7 +226,6 @@ gint GtkModeManage( intf_thread_t * p_intf )
gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_subpictures"), gtk_widget_set_sensitive( GETWIDGET(p_popup,"popup_subpictures"),
FALSE ); FALSE );
} }
}
/* set control items */ /* set control items */
gtk_widget_set_sensitive( GETWIDGET(p_window, "toolbar_back"), FALSE ); gtk_widget_set_sensitive( GETWIDGET(p_window, "toolbar_back"), FALSE );
......
...@@ -667,6 +667,7 @@ void __fastcall TMainFrameDlg::ModeManage() ...@@ -667,6 +667,7 @@ void __fastcall TMainFrameDlg::ModeManage()
/* add space between tolbar and statusbar when /* add space between tolbar and statusbar when
* nothing is displayed; isn't it nicer ? :) */ * nothing is displayed; isn't it nicer ? :) */
i_Height += 17; i_Height += 17;
}
/* unsensitize menus */ /* unsensitize menus */
MenuProgram->Enabled = false; MenuProgram->Enabled = false;
...@@ -678,7 +679,6 @@ void __fastcall TMainFrameDlg::ModeManage() ...@@ -678,7 +679,6 @@ void __fastcall TMainFrameDlg::ModeManage()
PopupAudio->Enabled = false; PopupAudio->Enabled = false;
PopupSubtitles->Enabled = false; PopupSubtitles->Enabled = false;
} }
}
/* resize main window */ /* resize main window */
this->Height = i_Height; this->Height = i_Height;
......
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