Mercurial > mplayer.hg

comparison gui/ui/gtk/fileselect.c @ 34344:5a7bb8f06478

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add Return key events to file selector buttons. This helps when operating the GUI with a remote control (and doesn't harm if not).
author ib
date Sun, 11 Dec 2011 15:52:32 +0000
parents 8a7056729022
children 1f6e77b8cb1d
comparison
equal deleted inserted replaced
34343:9c695b52687e 34344:5a7bb8f06478
541 541
542 static gboolean on_FileSelect_key_release_event( GtkWidget * widget, 542 static gboolean on_FileSelect_key_release_event( GtkWidget * widget,
543 GdkEventKey * event, 543 GdkEventKey * event,
544 gpointer user_data ) 544 gpointer user_data )
545 { 545 {
546 if ( GTK_WIDGET_TYPE( widget ) == GTK_TYPE_BUTTON )
547 {
548 if (event->keyval == GDK_Return) gtk_button_released( GTK_BUTTON( widget ) );
549 }
550 else
551 {
546 switch ( event->keyval ) 552 switch ( event->keyval )
547 { 553 {
548 case GDK_Escape: 554 case GDK_Escape:
549 gtk_button_released( GTK_BUTTON( fsCancel ) ); 555 gtk_button_released( GTK_BUTTON( fsCancel ) );
550 break; 556 break;
553 break; 559 break;
554 case GDK_BackSpace: 560 case GDK_BackSpace:
555 gtk_button_released( GTK_BUTTON( fsUp ) ); 561 gtk_button_released( GTK_BUTTON( fsUp ) );
556 break; 562 break;
557 } 563 }
564 }
558 return FALSE; 565 return FALSE;
559 } 566 }
560 567
561 static gboolean fs_fsFNameList_event( GtkWidget * widget, 568 static gboolean fs_fsFNameList_event( GtkWidget * widget,
562 GdkEvent * event, 569 GdkEvent * event,
709 gtk_signal_connect( GTK_OBJECT( fsFilterCombo ),"changed",GTK_SIGNAL_FUNC( fs_fsFilterCombo_changed ),fsFilterCombo ); 716 gtk_signal_connect( GTK_OBJECT( fsFilterCombo ),"changed",GTK_SIGNAL_FUNC( fs_fsFilterCombo_changed ),fsFilterCombo );
710 gtk_signal_connect( GTK_OBJECT( fsFilterCombo ),"activate",GTK_SIGNAL_FUNC( fs_fsFilterCombo_activate ),fsFilterCombo ); 717 gtk_signal_connect( GTK_OBJECT( fsFilterCombo ),"activate",GTK_SIGNAL_FUNC( fs_fsFilterCombo_activate ),fsFilterCombo );
711 gtk_signal_connect( GTK_OBJECT( fsPathCombo ),"changed",GTK_SIGNAL_FUNC( fs_fsPathCombo_changed ),fsPathCombo ); 718 gtk_signal_connect( GTK_OBJECT( fsPathCombo ),"changed",GTK_SIGNAL_FUNC( fs_fsPathCombo_changed ),fsPathCombo );
712 gtk_signal_connect( GTK_OBJECT( fsPathCombo ),"activate",GTK_SIGNAL_FUNC( fs_fsPathCombo_activate ),fsPathCombo ); 719 gtk_signal_connect( GTK_OBJECT( fsPathCombo ),"activate",GTK_SIGNAL_FUNC( fs_fsPathCombo_activate ),fsPathCombo );
713 gtk_signal_connect( GTK_OBJECT( fsUp ),"released",GTK_SIGNAL_FUNC( fs_Up_released ),fsFNameList ); 720 gtk_signal_connect( GTK_OBJECT( fsUp ),"released",GTK_SIGNAL_FUNC( fs_Up_released ),fsFNameList );
721 gtk_signal_connect( GTK_OBJECT( fsUp ),"key_release_event",GTK_SIGNAL_FUNC( on_FileSelect_key_release_event ),NULL );
714 gtk_signal_connect( GTK_OBJECT( fsOk ),"released",GTK_SIGNAL_FUNC( fs_Ok_released ),fsCombo4 ); 722 gtk_signal_connect( GTK_OBJECT( fsOk ),"released",GTK_SIGNAL_FUNC( fs_Ok_released ),fsCombo4 );
723 gtk_signal_connect( GTK_OBJECT( fsOk ),"key_release_event",GTK_SIGNAL_FUNC( on_FileSelect_key_release_event ),NULL );
715 gtk_signal_connect( GTK_OBJECT( fsCancel ),"released",GTK_SIGNAL_FUNC( fs_Cancel_released ),NULL ); 724 gtk_signal_connect( GTK_OBJECT( fsCancel ),"released",GTK_SIGNAL_FUNC( fs_Cancel_released ),NULL );
725 gtk_signal_connect( GTK_OBJECT( fsCancel ),"key_release_event",GTK_SIGNAL_FUNC( on_FileSelect_key_release_event ),NULL );
716 gtk_signal_connect( GTK_OBJECT( fsFNameList ),"select_row",(GtkSignalFunc)fs_fsFNameList_select_row,NULL ); 726 gtk_signal_connect( GTK_OBJECT( fsFNameList ),"select_row",(GtkSignalFunc)fs_fsFNameList_select_row,NULL );
717 gtk_signal_connect( GTK_OBJECT( fsFNameList ),"event", (GtkSignalFunc)fs_fsFNameList_event,NULL ); 727 gtk_signal_connect( GTK_OBJECT( fsFNameList ),"event", (GtkSignalFunc)fs_fsFNameList_event,NULL );
718 728
719 gtk_widget_grab_focus( fsFNameList ); 729 gtk_widget_grab_focus( fsFNameList );
720 730