[MPlayer-cvslog] r38295 - in trunk/gui: dialog/msgbox.c ui/menu.c ui/playbar.c ui/video.c

[ib]

Author: ib
Date: Mon Mar  1 16:11:10 2021
New Revision: 38295

Log:
Apply the macro MPlayer instead of using text constants.

Additionally, adjust the names of the menu window and the playbar window
(even if they only appear in debug messages).

Modified:
   trunk/gui/dialog/msgbox.c
   trunk/gui/ui/menu.c
   trunk/gui/ui/playbar.c
   trunk/gui/ui/video.c

Modified: trunk/gui/dialog/msgbox.c
==============================================================================
--- trunk/gui/dialog/msgbox.c	Mon Mar  1 16:09:43 2021	(r38294)
+++ trunk/gui/dialog/msgbox.c	Mon Mar  1 16:11:10 2021	(r38295)
@@ -54,7 +54,7 @@ static GtkWidget * CreateMessageBox( voi
 
  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_title( GTK_WINDOW( MessageBox ),MPlayer" …");
  gtk_window_set_position( GTK_WINDOW( MessageBox ),GTK_WIN_POS_CENTER );
  gtk_window_set_modal( GTK_WINDOW( MessageBox ),TRUE );
  gtk_window_set_policy( GTK_WINDOW( MessageBox ),FALSE,FALSE,TRUE );

Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c	Mon Mar  1 16:09:43 2021	(r38294)
+++ trunk/gui/ui/menu.c	Mon Mar  1 16:11:10 2021	(r38295)
@@ -115,7 +115,7 @@ void uiMenuInit( void )
 
  wsWindowCreate( &guiApp.menuWindow,
  guiApp.menu.x,guiApp.menu.y,guiApp.menu.width,guiApp.menu.height,
- wsOverredirect|wsHideFrame|wsMaxSize|wsMinSize|wsHideWindow,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,"MPlayer menu" );
+ wsOverredirect|wsHideFrame|wsMaxSize|wsMinSize|wsHideWindow,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,MPlayer" - Menu" );
 
  mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[menu] menuWindow ID: 0x%x\n",(int)guiApp.menuWindow.WindowID );
 

Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c	Mon Mar  1 16:09:43 2021	(r38294)
+++ trunk/gui/ui/playbar.c	Mon Mar  1 16:11:10 2021	(r38295)
@@ -293,7 +293,7 @@ void uiPlaybarInit( void )
  guiApp.playbarWindow.Parent=guiApp.videoWindow.WindowID;
  wsWindowCreate( &guiApp.playbarWindow,
    guiApp.playbar.x,guiApp.playbar.y,guiApp.playbar.width,guiApp.playbar.height,
-   wsHideFrame|wsHideWindow,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,"PlayBar" );
+   wsHideFrame|wsHideWindow,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,MPlayer" - PlayBar" );
 
  mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[playbar] playbarWindow ID: 0x%x\n",(int)guiApp.playbarWindow.WindowID );
 

Modified: trunk/gui/ui/video.c
==============================================================================
--- trunk/gui/ui/video.c	Mon Mar  1 16:09:43 2021	(r38294)
+++ trunk/gui/ui/video.c	Mon Mar  1 16:11:10 2021	(r38295)
@@ -112,7 +112,7 @@ static void uiVideoMouse( int Button,int
 
 void uiVideoInit (void)
 {
-  wsWindowCreate(&guiApp.videoWindow, guiApp.video.x, guiApp.video.y, guiApp.video.width, guiApp.video.height, wsShowFrame | wsHideWindow | wsAspect, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, "MPlayer - Video");
+  wsWindowCreate(&guiApp.videoWindow, guiApp.video.x, guiApp.video.y, guiApp.video.width, guiApp.video.height, wsShowFrame | wsHideWindow | wsAspect, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, MPlayer" - Video");
   mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[video] videoWindow ID: 0x%x\n", (int) guiApp.videoWindow.WindowID);
   wsWindowIcon(wsDisplay, guiApp.videoWindow.WindowID, &guiIcon);
   if (guiApp.video.Bitmap.Image)