October 2021 - MPlayer-cvslog - lists.mplayerhq.hu

r38325 - trunk/gui/dialog/skinbrowser.c
by ib 25 Oct '21

25 Oct '21

Author: ib Date: Mon Oct 25 16:15:36 2021 New Revision: 38325 Log: Raise skin browser on top while previewing a selected skin. After selecting a skin for previewing, the skin browser does not raise on top again. Instead, the main window is on top. Make the skin browser to raise on top by hiding and immediately showing it again. Modified: trunk/gui/dialog/skinbrowser.c Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Mon Oct 25 16:13:43 2021 (r38324) +++ trunk/gui/dialog/skinbrowser.c Mon Oct 25 16:15:36 2021 (r38325) @@ -74,7 +74,8 @@ static void on_SkinList_select_row( GtkC { prevSelected=sbSelectedSkin; uiChangeSkin( sbSelectedSkin ); - gtkRaise( SkinBrowser ); + gtk_widget_hide( SkinBrowser ); + gtk_widget_show( SkinBrowser ); } if( !event ) return; if( event->type == GDK_2BUTTON_PRESS )

1 0

r38324 - trunk/gui/wm/ws.c
by ib 25 Oct '21

25 Oct '21

Author: ib Date: Mon Oct 25 16:13:43 2021 New Revision: 38324 Log: Remove comments. The statements are the same as in x11_common. Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Mon Oct 25 16:11:27 2021 (r38323) +++ trunk/gui/wm/ws.c Mon Oct 25 16:13:43 2021 (r38324) @@ -1311,8 +1311,8 @@ void wsWindowVisibility(wsWindow *win, i */ void wsWindowRaiseTop(Display *display, Window Win) { - XMapRaised(display, Win); // NOTE TO MYSELF: is that really enough? - XRaiseWindow(display, Win); // NOTE TO MYSELF: is that really enough? + XMapRaised(display, Win); + XRaiseWindow(display, Win); } // ----------------------------------------------------------------------------------------------

1 0

r38323 - trunk/gui/wm/ws.c
by ib 25 Oct '21

25 Oct '21

Author: ib Date: Mon Oct 25 16:11:27 2021 New Revision: 38323 Log: Revert r38322. It broke the ability to switch to full screen mode. Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Tue Oct 5 13:02:45 2021 (r38322) +++ trunk/gui/wm/ws.c Mon Oct 25 16:11:27 2021 (r38323) @@ -1311,9 +1311,8 @@ void wsWindowVisibility(wsWindow *win, i */ void wsWindowRaiseTop(Display *display, Window Win) { - XUnmapWindow(display, Win); - XMapRaised(display, Win); - XRaiseWindow(display, Win); + XMapRaised(display, Win); // NOTE TO MYSELF: is that really enough? + XRaiseWindow(display, Win); // NOTE TO MYSELF: is that really enough? } // ----------------------------------------------------------------------------------------------

1 0

r38322 - trunk/gui/wm/ws.c
by ib 05 Oct '21

05 Oct '21

Author: ib Date: Tue Oct 5 13:02:45 2021 New Revision: 38322 Log: Fix wsWindowRaiseTop(). It did not work in all cases, as the skin browser did not raise on top again while previewing a selected skin. (Instead, the main window was on top.) Modified: trunk/gui/wm/ws.c Modified: trunk/gui/wm/ws.c ============================================================================== --- trunk/gui/wm/ws.c Tue Oct 5 12:58:25 2021 (r38321) +++ trunk/gui/wm/ws.c Tue Oct 5 13:02:45 2021 (r38322) @@ -1311,8 +1311,9 @@ void wsWindowVisibility(wsWindow *win, i */ void wsWindowRaiseTop(Display *display, Window Win) { - XMapRaised(display, Win); // NOTE TO MYSELF: is that really enough? - XRaiseWindow(display, Win); // NOTE TO MYSELF: is that really enough? + XUnmapWindow(display, Win); + XMapRaised(display, Win); + XRaiseWindow(display, Win); } // ----------------------------------------------------------------------------------------------

1 0

r38321 - in trunk/gui/dialog: fileselect.c playlist.c
by ib 05 Oct '21

05 Oct '21

Author: ib Date: Tue Oct 5 12:58:25 2021 New Revision: 38321 Log: Remove pointless "key-release-event" button signals. The return key on buttons is already handled by GTK itself. Modified: trunk/gui/dialog/fileselect.c trunk/gui/dialog/playlist.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Tue Oct 5 12:55:31 2021 (r38320) +++ trunk/gui/dialog/fileselect.c Tue Oct 5 12:58:25 2021 (r38321) @@ -705,8 +705,6 @@ static gboolean fs_key_release_event(Gtk if (GTK_IS_SCROLLED_WINDOW(widget)) gtk_button_clicked(GTK_BUTTON(fsOk)); - else if (GTK_IS_BUTTON(widget)) - gtk_button_clicked(GTK_BUTTON(widget)); else if (GTK_IS_ENTRY(widget)) gtk_widget_grab_focus(fsFNameList); @@ -840,11 +838,8 @@ static GtkWidget *CreateFileSelect(void) gtk_signal_connect(GTK_OBJECT(fsPathCombo), "changed", GTK_SIGNAL_FUNC(fs_fsPathCombo_changed), fsPathCombo); gtk_signal_connect(GTK_OBJECT(fsPathCombo), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL); gtk_signal_connect(GTK_OBJECT(fsUp), "clicked", GTK_SIGNAL_FUNC(fs_Up_released), fsFNameList); - gtk_signal_connect(GTK_OBJECT(fsUp), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL); gtk_signal_connect(GTK_OBJECT(fsOk), "clicked", GTK_SIGNAL_FUNC(fs_Ok_released), fsCombo4); - gtk_signal_connect(GTK_OBJECT(fsOk), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL); gtk_signal_connect(GTK_OBJECT(fsCancel), "clicked", GTK_SIGNAL_FUNC(fs_Cancel_released), NULL); - gtk_signal_connect(GTK_OBJECT(fsCancel), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL); gtk_signal_connect(GTK_OBJECT(fsFNameList), "select-row", (GtkSignalFunc)fs_fsFNameList_select_row, NULL); gtk_signal_connect(GTK_OBJECT(fsFNameList), "event", (GtkSignalFunc)fs_fsFNameList_event, NULL); Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Tue Oct 5 12:55:31 2021 (r38320) +++ trunk/gui/dialog/playlist.c Tue Oct 5 12:58:25 2021 (r38321) @@ -264,8 +264,7 @@ static gboolean plKeyReleased( GtkWidget { if (event->keyval == GDK_Return) { - if ( GTK_WIDGET_TYPE( widget ) == GTK_TYPE_BUTTON ) plButtonReleased( NULL, user_data ); - else + if ( GTK_WIDGET_TYPE( widget ) == GTK_TYPE_CLIST ) { switch ( GPOINTER_TO_INT( user_data) ) { @@ -577,13 +576,9 @@ static GtkWidget * CreatePlaylist( void gtk_signal_connect( GTK_OBJECT( CLSelected ),"key-release-event",GTK_SIGNAL_FUNC( plKeyReleased ),GINT_TO_POINTER(1) ); gtk_signal_connect( GTK_OBJECT( Add ),"clicked",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(3) ); - gtk_signal_connect( GTK_OBJECT( Add ),"key-release-event",GTK_SIGNAL_FUNC( plKeyReleased ),GINT_TO_POINTER(3) ); gtk_signal_connect( GTK_OBJECT( Remove ),"clicked",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(2) ); - gtk_signal_connect( GTK_OBJECT( Remove ),"key-release-event",GTK_SIGNAL_FUNC( plKeyReleased ),GINT_TO_POINTER(2) ); gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(1) ); - gtk_signal_connect( GTK_OBJECT( Ok ),"key-release-event",GTK_SIGNAL_FUNC( plKeyReleased ),GINT_TO_POINTER(1) ); gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(0) ); - gtk_signal_connect( GTK_OBJECT( Cancel ),"key-release-event",GTK_SIGNAL_FUNC( plKeyReleased ),GINT_TO_POINTER(0) ); gtk_window_add_accel_group( GTK_WINDOW( Playlist ),accel_group );

1 0

r38320 - trunk/gui/dialog/fileselect.c
by ib 05 Oct '21

05 Oct '21

Author: ib Date: Tue Oct 5 12:55:31 2021 New Revision: 38320 Log: Realize canceling the file sector dialog through an accelerator group. Let the accelerator group handle the escape key instead of handling the key press event ourselves. Accelerator groups are already used for this purpose in all other dialogs. This way, the escape key is now also recognized everywhere in the file selector dialog and not only in the file list. Modified: trunk/gui/dialog/fileselect.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Tue Oct 5 12:51:40 2021 (r38319) +++ trunk/gui/dialog/fileselect.c Tue Oct 5 12:55:31 2021 (r38320) @@ -701,13 +701,6 @@ static gboolean fs_key_release_event(Gtk (void)user_data; switch (event->key.keyval) { - case GDK_Escape: - - if (GTK_IS_SCROLLED_WINDOW(widget)) - gtk_button_clicked(GTK_BUTTON(fsCancel)); - - break; - case GDK_Return: if (GTK_IS_SCROLLED_WINDOW(widget)) @@ -746,6 +739,7 @@ static void fs_Destroy(void) static GtkWidget *CreateFileSelect(void) { gint x, y; + GtkAccelGroup *accel_group; GtkWidget *vbox4; GtkWidget *hbox4; GtkWidget *vseparator1; @@ -756,6 +750,8 @@ static GtkWidget *CreateFileSelect(void) GtkWidget *upimage; GdkPixbuf *uppixbuf; + accel_group = gtk_accel_group_new(); + FileSelector = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_widget_set_usize(FileSelector, 512, 440); gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_GUI_SelectFile); @@ -834,6 +830,8 @@ static GtkWidget *CreateFileSelect(void) fsOk = gtkAddButton(MSGTR_GUI_Ok, hbuttonbox3); fsCancel = gtkAddButton(MSGTR_GUI_Cancel, hbuttonbox3); + gtk_widget_add_accelerator(fsCancel, "clicked", accel_group, GDK_Escape, 0, GTK_ACCEL_VISIBLE); + gtk_signal_connect(GTK_OBJECT(FileSelector), "destroy", GTK_SIGNAL_FUNC(fs_Destroy), NULL); gtk_signal_connect(GTK_OBJECT(fsFNameListWindow), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL); @@ -850,6 +848,8 @@ static GtkWidget *CreateFileSelect(void) gtk_signal_connect(GTK_OBJECT(fsFNameList), "select-row", (GtkSignalFunc)fs_fsFNameList_select_row, NULL); gtk_signal_connect(GTK_OBJECT(fsFNameList), "event", (GtkSignalFunc)fs_fsFNameList_event, NULL); + gtk_window_add_accel_group(GTK_WINDOW(FileSelector), accel_group); + return FileSelector; }

1 0

r38319 - in trunk/gui/dialog: fileselect.c playlist.c
by ib 05 Oct '21

05 Oct '21

Author: ib Date: Tue Oct 5 12:51:40 2021 New Revision: 38319 Log: Prefer the "clicked" button signal to the "released" signal. The "clicked" button signal is commonly used throughout and there is no special need for the "released" signal. This now also allows to cancel the playlist dialog by pressing the escape key. Modified: trunk/gui/dialog/fileselect.c trunk/gui/dialog/playlist.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Tue Oct 5 12:46:22 2021 (r38318) +++ trunk/gui/dialog/fileselect.c Tue Oct 5 12:51:40 2021 (r38319) @@ -537,7 +537,7 @@ static gboolean fs_fsFNameList_event(Gtk if (event->type == GDK_BUTTON_RELEASE && bevent->button == 2) { if (gtk_clist_get_selection_info(GTK_CLIST(widget), bevent->x, bevent->y, &row, &col)) { fsSelectedFile = gtk_clist_get_row_data(GTK_CLIST(widget), row); - gtk_button_released(GTK_BUTTON(fsOk)); + gtk_button_clicked(GTK_BUTTON(fsOk)); return TRUE; } @@ -556,7 +556,7 @@ static void fs_fsFNameList_select_row(Gt fsSelectedFile = gtk_clist_get_row_data(clist, row); if (event && event->type == GDK_BUTTON_PRESS) - gtk_button_released(GTK_BUTTON(fsOk)); + gtk_button_clicked(GTK_BUTTON(fsOk)); } static void fs_Up_released(GtkButton *button, gpointer user_data) @@ -704,16 +704,16 @@ static gboolean fs_key_release_event(Gtk case GDK_Escape: if (GTK_IS_SCROLLED_WINDOW(widget)) - gtk_button_released(GTK_BUTTON(fsCancel)); + gtk_button_clicked(GTK_BUTTON(fsCancel)); break; case GDK_Return: if (GTK_IS_SCROLLED_WINDOW(widget)) - gtk_button_released(GTK_BUTTON(fsOk)); + gtk_button_clicked(GTK_BUTTON(fsOk)); else if (GTK_IS_BUTTON(widget)) - gtk_button_released(GTK_BUTTON(widget)); + gtk_button_clicked(GTK_BUTTON(widget)); else if (GTK_IS_ENTRY(widget)) gtk_widget_grab_focus(fsFNameList); @@ -722,7 +722,7 @@ static gboolean fs_key_release_event(Gtk case GDK_BackSpace: if (GTK_IS_SCROLLED_WINDOW(widget)) { - gtk_button_released(GTK_BUTTON(fsUp)); + gtk_button_clicked(GTK_BUTTON(fsUp)); gtk_widget_grab_focus(fsFNameList); } @@ -841,11 +841,11 @@ static GtkWidget *CreateFileSelect(void) gtk_signal_connect(GTK_OBJECT(fsFilterCombo), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL); gtk_signal_connect(GTK_OBJECT(fsPathCombo), "changed", GTK_SIGNAL_FUNC(fs_fsPathCombo_changed), fsPathCombo); gtk_signal_connect(GTK_OBJECT(fsPathCombo), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL); - gtk_signal_connect(GTK_OBJECT(fsUp), "released", GTK_SIGNAL_FUNC(fs_Up_released), fsFNameList); + gtk_signal_connect(GTK_OBJECT(fsUp), "clicked", GTK_SIGNAL_FUNC(fs_Up_released), fsFNameList); gtk_signal_connect(GTK_OBJECT(fsUp), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL); - gtk_signal_connect(GTK_OBJECT(fsOk), "released", GTK_SIGNAL_FUNC(fs_Ok_released), fsCombo4); + gtk_signal_connect(GTK_OBJECT(fsOk), "clicked", GTK_SIGNAL_FUNC(fs_Ok_released), fsCombo4); gtk_signal_connect(GTK_OBJECT(fsOk), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL); - gtk_signal_connect(GTK_OBJECT(fsCancel), "released", GTK_SIGNAL_FUNC(fs_Cancel_released), NULL); + gtk_signal_connect(GTK_OBJECT(fsCancel), "clicked", GTK_SIGNAL_FUNC(fs_Cancel_released), NULL); gtk_signal_connect(GTK_OBJECT(fsCancel), "key-release-event", GTK_SIGNAL_FUNC(fs_key_release_event), NULL); gtk_signal_connect(GTK_OBJECT(fsFNameList), "select-row", (GtkSignalFunc)fs_fsFNameList_select_row, NULL); gtk_signal_connect(GTK_OBJECT(fsFNameList), "event", (GtkSignalFunc)fs_fsFNameList_event, NULL); Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Tue Oct 5 12:46:22 2021 (r38318) +++ trunk/gui/dialog/playlist.c Tue Oct 5 12:51:40 2021 (r38319) @@ -576,13 +576,13 @@ static GtkWidget * CreatePlaylist( void sigEvent=gtk_signal_connect( GTK_OBJECT( CLSelected ),"event",GTK_SIGNAL_FUNC( plEvent ),GINT_TO_POINTER(1) ); gtk_signal_connect( GTK_OBJECT( CLSelected ),"key-release-event",GTK_SIGNAL_FUNC( plKeyReleased ),GINT_TO_POINTER(1) ); - gtk_signal_connect( GTK_OBJECT( Add ),"released",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(3) ); + gtk_signal_connect( GTK_OBJECT( Add ),"clicked",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(3) ); gtk_signal_connect( GTK_OBJECT( Add ),"key-release-event",GTK_SIGNAL_FUNC( plKeyReleased ),GINT_TO_POINTER(3) ); - gtk_signal_connect( GTK_OBJECT( Remove ),"released",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(2) ); + gtk_signal_connect( GTK_OBJECT( Remove ),"clicked",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(2) ); gtk_signal_connect( GTK_OBJECT( Remove ),"key-release-event",GTK_SIGNAL_FUNC( plKeyReleased ),GINT_TO_POINTER(2) ); - gtk_signal_connect( GTK_OBJECT( Ok ),"released",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(1) ); + gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(1) ); gtk_signal_connect( GTK_OBJECT( Ok ),"key-release-event",GTK_SIGNAL_FUNC( plKeyReleased ),GINT_TO_POINTER(1) ); - gtk_signal_connect( GTK_OBJECT( Cancel ),"released",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(0) ); + gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( plButtonReleased ),GINT_TO_POINTER(0) ); gtk_signal_connect( GTK_OBJECT( Cancel ),"key-release-event",GTK_SIGNAL_FUNC( plKeyReleased ),GINT_TO_POINTER(0) ); gtk_window_add_accel_group( GTK_WINDOW( Playlist ),accel_group );

1 0

r38318 - in trunk/gui/dialog: fileselect.c msgbox.c skinbrowser.c
by ib 05 Oct '21

05 Oct '21

Author: ib Date: Tue Oct 5 12:46:22 2021 New Revision: 38318 Log: Remove calls to gtk_widget_set_events(). A GtkWindow already has a sufficient event mask. Possibly additional events are not used at all. Modified: trunk/gui/dialog/fileselect.c trunk/gui/dialog/msgbox.c trunk/gui/dialog/skinbrowser.c Modified: trunk/gui/dialog/fileselect.c ============================================================================== --- trunk/gui/dialog/fileselect.c Tue Oct 5 12:41:36 2021 (r38317) +++ trunk/gui/dialog/fileselect.c Tue Oct 5 12:46:22 2021 (r38318) @@ -758,7 +758,6 @@ static GtkWidget *CreateFileSelect(void) FileSelector = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_widget_set_usize(FileSelector, 512, 440); - gtk_widget_set_events(FileSelector, GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK); gtk_window_set_title(GTK_WINDOW(FileSelector), MSGTR_GUI_SelectFile); gtk_window_set_position(GTK_WINDOW(FileSelector), GTK_WIN_POS_CENTER); gtk_window_get_position(GTK_WINDOW(FileSelector), &x, &y); Modified: trunk/gui/dialog/msgbox.c ============================================================================== --- trunk/gui/dialog/msgbox.c Tue Oct 5 12:41:36 2021 (r38317) +++ trunk/gui/dialog/msgbox.c Tue Oct 5 12:46:22 2021 (r38318) @@ -53,7 +53,6 @@ static GtkWidget * CreateMessageBox( voi accel_group=gtk_accel_group_new(); MessageBox=gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_widget_set_events( MessageBox,GDK_EXPOSURE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_VISIBILITY_NOTIFY_MASK ); gtk_window_set_title( GTK_WINDOW( MessageBox ),MPlayer" …"); gtk_window_set_position( GTK_WINDOW( MessageBox ),GTK_WIN_POS_CENTER ); gtk_window_set_modal( GTK_WINDOW( MessageBox ),TRUE ); Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Tue Oct 5 12:41:36 2021 (r38317) +++ trunk/gui/dialog/skinbrowser.c Tue Oct 5 12:46:22 2021 (r38318) @@ -99,7 +99,6 @@ void ShowSkinBrowser( void ) SkinBrowser=gtk_window_new( GTK_WINDOW_TOPLEVEL ); gtk_widget_set_usize( SkinBrowser,256,320 ); gtk_container_set_border_width( GTK_CONTAINER( SkinBrowser ),1 ); - gtk_widget_set_events( SkinBrowser,GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK ); gtk_window_set_title( GTK_WINDOW( SkinBrowser ),_(MSGTR_GUI_SkinBrowser) ); gtk_window_set_position( GTK_WINDOW( SkinBrowser ),GTK_WIN_POS_CENTER ); gtk_window_set_policy( GTK_WINDOW( SkinBrowser ),FALSE,FALSE,TRUE );

1 0

r38317 - trunk/gui/dialog/skinbrowser.c
by ib 05 Oct '21

05 Oct '21

Author: ib Date: Tue Oct 5 12:41:36 2021 New Revision: 38317 Log: Don't let the column title of the skin browser dialog be selectable. This is not necessary but rather confusing because the list of skins is not sortable. Modified: trunk/gui/dialog/skinbrowser.c Modified: trunk/gui/dialog/skinbrowser.c ============================================================================== --- trunk/gui/dialog/skinbrowser.c Tue Oct 5 12:39:13 2021 (r38316) +++ trunk/gui/dialog/skinbrowser.c Tue Oct 5 12:41:36 2021 (r38317) @@ -128,6 +128,7 @@ void ShowSkinBrowser( void ) gtk_clist_column_titles_show( GTK_CLIST( SkinList ) ); gtk_clist_set_shadow_type( GTK_CLIST( SkinList ),GTK_SHADOW_ETCHED_OUT ); gtk_clist_set_column_widget( GTK_CLIST( SkinList ),0, gtkAddLabel( _(MSGTR_GUI_AvailableSkins),NULL ) ); + gtk_clist_column_title_passive( GTK_CLIST( SkinList ),0 ); gtkAddHSeparator( vbox5 );

1 0

r38316 - trunk/gui/dialog/playlist.c
by ib 05 Oct '21

05 Oct '21

Author: ib Date: Tue Oct 5 12:39:13 2021 New Revision: 38316 Log: Remove a useless column from the file list of the playlist dialog. The (hidden) second column is never used. Furthermore, the unset column title causes a crash when focusing the file list (e.g. by using the tab key). Modified: trunk/gui/dialog/playlist.c Modified: trunk/gui/dialog/playlist.c ============================================================================== --- trunk/gui/dialog/playlist.c Tue Oct 5 12:32:11 2021 (r38315) +++ trunk/gui/dialog/playlist.c Tue Oct 5 12:39:13 2021 (r38316) @@ -397,7 +397,7 @@ static void scan_dir( char * path ) char * curr; struct dirent * dirent; struct stat statbuf; - char * text[1][3]; text[0][2]=""; + char * text[1]; gtk_clist_clear( GTK_CLIST( CLFiles ) ); if ( (dir=opendir( path )) ) @@ -408,10 +408,9 @@ static void scan_dir( char * path ) curr=calloc( 1,strlen( path ) + strlen( dirent->d_name ) + 3 ); sprintf( curr,"%s/%s",path,dirent->d_name ); if ( stat( curr,&statbuf ) != -1 && ( S_ISREG( statbuf.st_mode ) || S_ISLNK( statbuf.st_mode ) ) ) { - text[0][0]=g_filename_display_name( dirent->d_name ); - text[0][1]=dirent->d_name; - gtk_clist_append( GTK_CLIST( CLFiles ), text[0] ); - g_free( text[0][0] ); + text[0]=g_filename_display_name( dirent->d_name ); + gtk_clist_append( GTK_CLIST( CLFiles ), text ); + g_free( text[0] ); NrOfEntrys++; } free( curr ); @@ -516,11 +515,10 @@ static GtkWidget * CreatePlaylist( void gtk_box_pack_start( GTK_BOX( vbox2 ),scrolledwindow2,TRUE,TRUE,0 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow2 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC ); - CLFiles=gtk_clist_new( 2 ); + CLFiles=gtk_clist_new( 1 ); gtk_widget_show( CLFiles ); gtk_container_add( GTK_CONTAINER( scrolledwindow2 ),CLFiles ); gtk_clist_set_column_width( GTK_CLIST( CLFiles ),0,80 ); - gtk_clist_set_column_visibility( GTK_CLIST( CLFiles ),1,FALSE ); gtk_clist_set_selection_mode( GTK_CLIST( CLFiles ),GTK_SELECTION_MULTIPLE ); gtk_clist_column_titles_show( GTK_CLIST( CLFiles ) ); gtk_clist_set_shadow_type( GTK_CLIST( CLFiles ),GTK_SHADOW_NONE );

1 0