[MPlayer-cvslog] r36090 - in trunk/gui/dialog: about.c dialog.c equalizer.c fileselect.c menu.c menu.h msgbox.c playlist.c preferences.c skinbrowser.c url.c
ib
subversion at mplayerhq.hu
Fri Mar 29 14:43:21 CET 2013
Author: ib
Date: Fri Mar 29 14:43:21 2013
New Revision: 36090
Log:
Cosmetic: Rename the functions creating the dialogs.
Modified:
trunk/gui/dialog/about.c
trunk/gui/dialog/dialog.c
trunk/gui/dialog/equalizer.c
trunk/gui/dialog/fileselect.c
trunk/gui/dialog/menu.c
trunk/gui/dialog/menu.h
trunk/gui/dialog/msgbox.c
trunk/gui/dialog/playlist.c
trunk/gui/dialog/preferences.c
trunk/gui/dialog/skinbrowser.c
trunk/gui/dialog/url.c
Modified: trunk/gui/dialog/about.c
==============================================================================
--- trunk/gui/dialog/about.c Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/about.c Fri Mar 29 14:43:21 2013 (r36090)
@@ -31,7 +31,7 @@ GtkWidget * About = NULL;
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 @@ static GtkWidget * create_About( void )
void ShowAbout( void )
{
if ( About ) gtkActive( About );
- else About=create_About();
+ else About=CreateAbout();
gtk_widget_show( About );
}
Modified: trunk/gui/dialog/dialog.c
==============================================================================
--- trunk/gui/dialog/dialog.c Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/dialog.c Fri Mar 29 14:43:21 2013 (r36090)
@@ -353,7 +353,7 @@ void gtkShow(int type, char *param)
gtk_widget_destroy(PopUpMenu);
}
- PopUpMenu = create_PopUpMenu();
+ PopUpMenu = CreatePopUpMenu();
gtk_menu_popup(GTK_MENU(PopUpMenu), NULL, NULL, NULL, NULL, 0, 0);
break;
Modified: trunk/gui/dialog/equalizer.c
==============================================================================
--- trunk/gui/dialog/equalizer.c Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/equalizer.c Fri Mar 29 14:43:21 2013 (r36090)
@@ -232,7 +232,7 @@ static void eqNotebook( GtkNotebook * no
else gtk_widget_show( Config );
}
-static GtkWidget * create_Equalizer( void )
+static GtkWidget * CreateEqualizer( void )
{
GtkWidget * vbox1;
GtkWidget * hbox1;
@@ -461,7 +461,7 @@ static GtkWidget * create_Equalizer( voi
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 * CEChannel6;
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 @@ static void ecButtonReleased( GtkButton
HideEquConfig();
}
-GtkWidget * create_EquConfig( void )
+GtkWidget * CreateEquConfig( void )
{
GtkWidget * vbox1;
GtkWidget * table1;
Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/fileselect.c Fri Mar 29 14:43:21 2013 (r36090)
@@ -523,7 +523,7 @@ static void fs_Destroy( void )
fsTopList_items = NULL;
}
-static GtkWidget * create_FileSelect( void )
+static GtkWidget * CreateFileSelect( void )
{
GtkWidget * vbox4;
GtkWidget * hbox4;
@@ -660,7 +660,7 @@ void ShowFileSelector( int type )
struct stat f;
if ( FileSelector ) gtkActive( FileSelector );
- else FileSelector=create_FileSelect();
+ else FileSelector=CreateFileSelect();
fsType=type;
switch ( type )
Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/menu.c Fri Mar 29 14:43:21 2013 (r36090)
@@ -413,7 +413,7 @@ GtkWidget * VCDTitleMenu;
GtkWidget * CDSubMenu;
GtkWidget * CDTitleMenu;
-GtkWidget * create_PopUpMenu( void )
+GtkWidget * CreatePopUpMenu( void )
{
GtkWidget * window1;
GtkWidget * Menu = NULL;
Modified: trunk/gui/dialog/menu.h
==============================================================================
--- trunk/gui/dialog/menu.h Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/menu.h Fri Mar 29 14:43:21 2013 (r36090)
@@ -26,6 +26,6 @@ extern GtkWidget * DVDSubMenu;
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 */
Modified: trunk/gui/dialog/msgbox.c
==============================================================================
--- trunk/gui/dialog/msgbox.c Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/msgbox.c Fri Mar 29 14:43:21 2013 (r36090)
@@ -38,7 +38,7 @@ static void on_Ok_released( GtkButton *
MessageBox=NULL;
}
-static GtkWidget * create_MessageBox( void )
+static GtkWidget * CreateMessageBox( void )
{
GtkWidget * vbox1;
GtkWidget * hbox1;
@@ -110,6 +110,6 @@ static GtkWidget * create_MessageBox( vo
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 );
}
Modified: trunk/gui/dialog/playlist.c
==============================================================================
--- trunk/gui/dialog/playlist.c Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/playlist.c Fri Mar 29 14:43:21 2013 (r36090)
@@ -415,7 +415,7 @@ static void plCTRow(GtkCList * clist, gi
CLFileSelected=calloc( 1,NrOfEntrys * sizeof( int ) );
}
-static GtkWidget * create_Playlist( void )
+static GtkWidget * CreatePlaylist( void )
{
GtkWidget * vbox1;
GtkWidget * hbox1;
@@ -577,7 +577,7 @@ void ShowPlaylist( void )
plItem * next;
if ( Playlist ) gtkActive( Playlist );
- else Playlist=create_Playlist();
+ else Playlist=CreatePlaylist();
if ( old_path && *old_path )
{
Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/preferences.c Fri Mar 29 14:43:21 2013 (r36090)
@@ -510,7 +510,7 @@ static void prCListRow( GtkCList * clist
}
}
-static GtkWidget * create_Preferences( void )
+static GtkWidget * CreatePreferences( void )
{
GtkWidget * label;
GtkWidget * frame;
@@ -1092,7 +1092,7 @@ static GtkWidget * create_Preferences( v
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 void audioButton(GtkButton *butto
}
}
-static GtkWidget *create_AudioConfig( void ) {
+static GtkWidget *CreateAudioConfig( void ) {
GList *items = NULL;
GtkWidget *vbox;
GtkWidget *table;
@@ -1677,7 +1677,7 @@ static GtkWidget *create_AudioConfig( vo
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 * RBVLavc;
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 @@ static void dxr3Button( GtkButton * butt
}
}
-GtkWidget * create_DXR3Config( void )
+GtkWidget * CreateDXR3Config( void )
{
GtkWidget * vbox1;
GtkWidget * vbox2;
Modified: trunk/gui/dialog/skinbrowser.c
==============================================================================
--- trunk/gui/dialog/skinbrowser.c Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/skinbrowser.c Fri Mar 29 14:43:21 2013 (r36090)
@@ -89,7 +89,7 @@ static void on_SkinList_select_row( GtkC
}
}
-static GtkWidget * create_SkinBrowser( void )
+static GtkWidget * CreateSkinBrowser( void )
{
GtkWidget * vbox5;
GtkWidget * scrolledwindow1;
@@ -170,7 +170,7 @@ static GtkWidget * create_SkinBrowser( v
void ShowSkinBrowser( void )
{
if ( SkinBrowser ) gtkActive( SkinBrowser );
- else SkinBrowser=create_SkinBrowser();
+ else SkinBrowser=CreateSkinBrowser();
}
int gtkFillSkinList( gchar * mdir )
Modified: trunk/gui/dialog/url.c
==============================================================================
--- trunk/gui/dialog/url.c Fri Mar 29 02:41:06 2013 (r36089)
+++ trunk/gui/dialog/url.c Fri Mar 29 14:43:21 2013 (r36090)
@@ -82,7 +82,7 @@ static void on_Button_pressed( GtkButton
HideURLDialog();
}
-static GtkWidget * create_URLDialog( void )
+static GtkWidget * CreateURLDialog( void )
{
GtkWidget * vbox1;
GtkWidget * hbox1;
@@ -148,7 +148,7 @@ void ShowURLDialog( void )
urlItem * item;
if ( URLDialog ) gtkActive( URLDialog );
- else URLDialog=create_URLDialog();
+ else URLDialog=CreateURLDialog();
item = listMgr( URLLIST_GET,0 );
More information about the MPlayer-cvslog
mailing list