[MPlayer-cvslog] r35860 - in trunk/gui/ui: main.c menu.c playbar.c ui.h video.c

[ib]

Author: ib
Date: Thu Jan 24 18:36:42 2013
New Revision: 35860

Log:
Rename uiShowMenu() uiMenuShow() and uiHideMenu() uiMenuHide().

Modified:
   trunk/gui/ui/main.c
   trunk/gui/ui/menu.c
   trunk/gui/ui/playbar.c
   trunk/gui/ui/ui.h
   trunk/gui/ui/video.c

Modified: trunk/gui/ui/main.c
==============================================================================
--- trunk/gui/ui/main.c	Thu Jan 24 18:31:57 2013	(r35859)
+++ trunk/gui/ui/main.c	Thu Jan 24 18:36:42 2013	(r35860)
@@ -323,7 +323,7 @@ NoPause:
         /*if (guiApp.menuIsPresent)   NOTE TO MYSELF: Uncomment only after mouse
          {                                            pointer and cursor keys work
           gtkShow( ivHidePopUpMenu,NULL );            with this menu from skin as
-          uiShowMenu( 0,0 );                          they do with normal menus.
+          uiMenuShow( 0,0 );                          they do with normal menus.
          }
         else*/ gtkShow( ivShowPopUpMenu,NULL );
         break;
@@ -438,11 +438,11 @@ void uiMainMouse( int Button,int X,int Y
   {
    case wsPMMouseButton:
 	  gtkShow( ivHidePopUpMenu,NULL );
-          uiShowMenu( RX,RY );
+          uiMenuShow( RX,RY );
           itemtype=itPRMButton;
           break;
    case wsRMMouseButton:
-          uiHideMenu( RX,RY,0 );
+          uiMenuHide( RX,RY,0 );
           break;
 
    case wsPLMouseButton:

Modified: trunk/gui/ui/menu.c
==============================================================================
--- trunk/gui/ui/menu.c	Thu Jan 24 18:31:57 2013	(r35859)
+++ trunk/gui/ui/menu.c	Thu Jan 24 18:36:42 2013	(r35860)
@@ -94,7 +94,7 @@ void uiMenuMouse( int RX,int RY )
  wsWindowRedraw( &guiApp.menuWindow );
 }
 
-void uiShowMenu( int mx,int my )
+void uiMenuShow( int mx,int my )
 {
  int x,y;
 
@@ -117,7 +117,7 @@ void uiShowMenu( int mx,int my )
  wsWindowRedraw( &guiApp.menuWindow );
 }
 
-void uiHideMenu( int mx,int my,int w )
+void uiMenuHide( int mx,int my,int w )
 {
  int x,y,i=menuItem;
 

Modified: trunk/gui/ui/playbar.c
==============================================================================
--- trunk/gui/ui/playbar.c	Thu Jan 24 18:31:57 2013	(r35859)
+++ trunk/gui/ui/playbar.c	Thu Jan 24 18:36:42 2013	(r35860)
@@ -134,10 +134,10 @@ static void uiPlaybarMouse( int Button, 
   {
    case wsPMMouseButton:
         gtkShow( ivHidePopUpMenu,NULL );
-        uiShowMenu( RX,RY );
+        uiMenuShow( RX,RY );
         break;
    case wsRMMouseButton:
-        uiHideMenu( RX,RY,0 );
+        uiMenuHide( RX,RY,0 );
         break;
    case wsRRMouseButton:
         gtkShow( ivShowPopUpMenu,NULL );

Modified: trunk/gui/ui/ui.h
==============================================================================
--- trunk/gui/ui/ui.h	Thu Jan 24 18:31:57 2013	(r35859)
+++ trunk/gui/ui/ui.h	Thu Jan 24 18:36:42 2013	(r35860)
@@ -40,8 +40,8 @@ void uiVideoDraw( void );
 void uiVideoMouse( int Button, int X, int Y, int RX, int RY );
 
 void uiMenuInit( void );
-void uiHideMenu( int mx, int my, int w );
-void uiShowMenu( int mx, int my );
+void uiMenuHide( int mx, int my, int w );
+void uiMenuShow( int mx, int my );
 void uiMenuMouse( int RX, int RY );
 
 void uiPlaybarInit( void );

Modified: trunk/gui/ui/video.c
==============================================================================
--- trunk/gui/ui/video.c	Thu Jan 24 18:31:57 2013	(r35859)
+++ trunk/gui/ui/video.c	Thu Jan 24 18:36:42 2013	(r35860)
@@ -64,11 +64,11 @@ void uiVideoMouse( int Button,int X,int 
           break;
    case wsPMMouseButton:
           gtkShow( ivHidePopUpMenu,NULL );
-          uiShowMenu( RX,RY );
+          uiMenuShow( RX,RY );
           msButton=wsPMMouseButton;
           break;
    case wsRMMouseButton:
-          uiHideMenu( RX,RY,1 );
+          uiMenuHide( RX,RY,1 );
           msButton=0;
           break;
 /* --- */