Mercurial > mplayer.hg

changeset 35996:6c891a0e3fea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Rename the functions creating the dialogs.
author ib
date Fri, 29 Mar 2013 13:43:21 +0000
parents 454b0a86d1e8
children 7d749e44a9e5
files gui/dialog/about.c gui/dialog/dialog.c gui/dialog/equalizer.c gui/dialog/fileselect.c gui/dialog/menu.c gui/dialog/menu.h gui/dialog/msgbox.c gui/dialog/playlist.c gui/dialog/preferences.c gui/dialog/skinbrowser.c gui/dialog/url.c
diffstat 11 files changed, 27 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/gui/dialog/about.c	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/about.c	Fri Mar 29 13:43:21 2013 +0000
@@ -31,7 +31,7 @@
 static void abWidgetDestroy( GtkButton * button, gpointer user_data )
 { WidgetDestroy( NULL,&About ); }
 
-static GtkWidget * create_About( void )
+static GtkWidget * CreateAbout( void )
 {
   GtkWidget     * vbox;
   GtkWidget     * pixmap1;
@@ -348,6 +348,6 @@
 void ShowAbout( void )
 {
  if ( About ) gtkActive( About );
-   else About=create_About();
+   else About=CreateAbout();
  gtk_widget_show( About );
 }
--- a/gui/dialog/dialog.c	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/dialog.c	Fri Mar 29 13:43:21 2013 +0000
@@ -353,7 +353,7 @@
             gtk_widget_destroy(PopUpMenu);
         }
 
-        PopUpMenu = create_PopUpMenu();
+        PopUpMenu = CreatePopUpMenu();
         gtk_menu_popup(GTK_MENU(PopUpMenu), NULL, NULL, NULL, NULL, 0, 0);
         break;
 
--- a/gui/dialog/equalizer.c	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/equalizer.c	Fri Mar 29 13:43:21 2013 +0000
@@ -232,7 +232,7 @@
    else gtk_widget_show( Config );
 }
 
-static GtkWidget * create_Equalizer( void )
+static GtkWidget * CreateEqualizer( void )
 {
   GtkWidget * vbox1;
   GtkWidget * hbox1;
@@ -461,7 +461,7 @@
 void ShowEqualizer( void )
 {
  if ( Equalizer ) gtkActive( Equalizer );
-    else Equalizer=create_Equalizer();
+    else Equalizer=CreateEqualizer();
 
  if ( !gtkEquChannel1 ) gtkEquChannel1=strdup( MSGTR_EQU_Front_Right );
  if ( !gtkEquChannel2 ) gtkEquChannel2=strdup( MSGTR_EQU_Front_Left );
@@ -517,14 +517,14 @@
 static GtkWidget * ecOk;
 static GtkWidget * ecCancel;
 
-GtkWidget * create_EquConfig( void );
+GtkWidget * CreateEquConfig( void );
 
 void ShowEquConfig( void )
 {
  GList * Items = NULL;
 
  if ( EquConfig ) gtkActive( EquConfig );
-    else EquConfig=create_EquConfig();
+    else EquConfig=CreateEquConfig();
 
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Right  );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Left );
@@ -576,7 +576,7 @@
  HideEquConfig();
 }
 
-GtkWidget * create_EquConfig( void )
+GtkWidget * CreateEquConfig( void )
 {
   GtkWidget * vbox1;
   GtkWidget * table1;
--- a/gui/dialog/fileselect.c	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/fileselect.c	Fri Mar 29 13:43:21 2013 +0000
@@ -523,7 +523,7 @@
  fsTopList_items = NULL;
 }
 
-static GtkWidget * create_FileSelect( void )
+static GtkWidget * CreateFileSelect( void )
 {
  GtkWidget     * vbox4;
  GtkWidget     * hbox4;
@@ -660,7 +660,7 @@
  struct stat f;
 
  if ( FileSelector ) gtkActive( FileSelector );
-  else FileSelector=create_FileSelect();
+  else FileSelector=CreateFileSelect();
 
  fsType=type;
  switch ( type )
--- a/gui/dialog/menu.c	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/menu.c	Fri Mar 29 13:43:21 2013 +0000
@@ -413,7 +413,7 @@
 GtkWidget * CDSubMenu;
 GtkWidget * CDTitleMenu;
 
-GtkWidget * create_PopUpMenu( void )
+GtkWidget * CreatePopUpMenu( void )
 {
  GtkWidget * window1;
  GtkWidget * Menu = NULL;
--- a/gui/dialog/menu.h	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/menu.h	Fri Mar 29 13:43:21 2013 +0000
@@ -26,6 +26,6 @@
 GtkWidget * AddMenuItem( GtkWidget *window1, const char * immagine_xpm, GtkWidget * SubMenu, const char * label, int Number );
 GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, GtkWidget * Menu, const char * label );
 GtkWidget * AddSeparator( GtkWidget * Menu );
-GtkWidget * create_PopUpMenu( void );
+GtkWidget * CreatePopUpMenu( void );
 
 #endif /* MPLAYER_GUI_MENU_H */
--- a/gui/dialog/msgbox.c	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/msgbox.c	Fri Mar 29 13:43:21 2013 +0000
@@ -38,7 +38,7 @@
  MessageBox=NULL;
 }
 
-static GtkWidget * create_MessageBox( void )
+static GtkWidget * CreateMessageBox( void )
 {
  GtkWidget * vbox1;
  GtkWidget * hbox1;
@@ -110,6 +110,6 @@
 void ShowMessageBox( const char * msg )
 {
  if ( MessageBox ) { gtk_widget_hide( MessageBox ); gtk_widget_destroy( MessageBox ); }
- MessageBox=create_MessageBox();
+ MessageBox=CreateMessageBox();
  if ( strlen( msg ) < 20 ) gtk_widget_set_usize( MessageBox,196,-1 );
 }
--- a/gui/dialog/playlist.c	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/playlist.c	Fri Mar 29 13:43:21 2013 +0000
@@ -415,7 +415,7 @@
  CLFileSelected=calloc( 1,NrOfEntrys * sizeof( int ) );
 }
 
-static GtkWidget * create_Playlist( void )
+static GtkWidget * CreatePlaylist( void )
 {
   GtkWidget 	* vbox1;
   GtkWidget 	* hbox1;
@@ -577,7 +577,7 @@
  plItem * next;
 
  if ( Playlist ) gtkActive( Playlist );
-  else Playlist=create_Playlist();
+  else Playlist=CreatePlaylist();
 
  if ( old_path && *old_path )
   {
--- a/gui/dialog/preferences.c	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/preferences.c	Fri Mar 29 13:43:21 2013 +0000
@@ -510,7 +510,7 @@
   }
 }
 
-static GtkWidget * create_Preferences( void )
+static GtkWidget * CreatePreferences( void )
 {
   GtkWidget * label;
   GtkWidget * frame;
@@ -1092,7 +1092,7 @@
 void ShowPreferences( void )
 {
  if ( Preferences ) gtkActive( Preferences );
-   else Preferences=create_Preferences();
+   else Preferences=CreatePreferences();
 
 /* 1st page */
  gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( CBAudioEqualizer ),gtkEnableAudioEqualizer );
@@ -1555,7 +1555,7 @@
   }
 }
 
-static GtkWidget *create_AudioConfig( void ) {
+static GtkWidget *CreateAudioConfig( void ) {
   GList *items = NULL;
   GtkWidget *vbox;
   GtkWidget *table;
@@ -1677,7 +1677,7 @@
 
 void ShowAudioConfig( void ) {
   if (AudioConfig) gtkActive(AudioConfig);
-  else AudioConfig = create_AudioConfig();
+  else AudioConfig = CreateAudioConfig();
 
 #ifdef CONFIG_OSS_AUDIO
   if (strncmp(ao_driver[0], "oss", 3) == 0) {
@@ -1718,12 +1718,12 @@
 static GtkWidget * dxr3BOk;
 static GtkWidget * dxr3BCancel;
 
-GtkWidget * create_DXR3Config( void );
+GtkWidget * CreateDXR3Config( void );
 
 void ShowDXR3Config( void )
 {
  if ( DXR3Config ) gtkActive( DXR3Config );
-  else DXR3Config=create_DXR3Config();
+  else DXR3Config=CreateDXR3Config();
 
  gtk_entry_set_text( GTK_ENTRY( CEDXR3Device ),gtkDXR3Device );
 
@@ -1755,7 +1755,7 @@
  }
 }
 
-GtkWidget * create_DXR3Config( void )
+GtkWidget * CreateDXR3Config( void )
 {
  GtkWidget * vbox1;
  GtkWidget * vbox2;
--- a/gui/dialog/skinbrowser.c	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/skinbrowser.c	Fri Mar 29 13:43:21 2013 +0000
@@ -89,7 +89,7 @@
   }
 }
 
-static GtkWidget * create_SkinBrowser( void )
+static GtkWidget * CreateSkinBrowser( void )
 {
  GtkWidget     * vbox5;
  GtkWidget     * scrolledwindow1;
@@ -170,7 +170,7 @@
 void ShowSkinBrowser( void )
 {
  if ( SkinBrowser ) gtkActive( SkinBrowser );
-   else SkinBrowser=create_SkinBrowser();
+   else SkinBrowser=CreateSkinBrowser();
 }
 
 int gtkFillSkinList( gchar * mdir )
--- a/gui/dialog/url.c	Fri Mar 29 01:41:06 2013 +0000
+++ b/gui/dialog/url.c	Fri Mar 29 13:43:21 2013 +0000
@@ -82,7 +82,7 @@
  HideURLDialog();
 }
 
-static GtkWidget * create_URLDialog( void )
+static GtkWidget * CreateURLDialog( void )
 {
  GtkWidget * vbox1;
  GtkWidget * hbox1;
@@ -148,7 +148,7 @@
  urlItem * item;
 
  if ( URLDialog ) gtkActive( URLDialog );
-   else URLDialog=create_URLDialog();
+   else URLDialog=CreateURLDialog();
 
  item = listMgr( URLLIST_GET,0 );