[MPlayer-cvslog] r38481 - in trunk/gui/dialog: about.c equalizer.c fileselect.c playlist.c preferences.c skinbrowser.c tools.c url.c
ib
subversion at mplayerhq.hu
Mon Apr 29 16:22:28 EEST 2024
Author: ib
Date: Mon Apr 29 16:22:27 2024
New Revision: 38481
Log:
Replace gtk_widget_set_usize() with gtk_widget_set_size_request().
gtk_widget_set_usize() is deprecated and gtk_widget_set_size_request()
is available in GTK+ 2.4 (the minimum requirement).
Modified:
trunk/gui/dialog/about.c
trunk/gui/dialog/equalizer.c
trunk/gui/dialog/fileselect.c
trunk/gui/dialog/playlist.c
trunk/gui/dialog/preferences.c
trunk/gui/dialog/skinbrowser.c
trunk/gui/dialog/tools.c
trunk/gui/dialog/url.c
Modified: trunk/gui/dialog/about.c
==============================================================================
--- trunk/gui/dialog/about.c Mon Apr 29 15:01:22 2024 (r38480)
+++ trunk/gui/dialog/about.c Mon Apr 29 16:22:27 2024 (r38481)
@@ -62,7 +62,7 @@ static GtkWidget * CreateAbout( void )
accel_group=gtk_accel_group_new();
About=gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_widget_set_usize( About,370,425 );
+ gtk_widget_set_size_request( About,370,425 );
gtk_window_set_title( GTK_WINDOW( About ),_(MSGTR_GUI_AboutMPlayer) );
gtk_window_set_position( GTK_WINDOW( About ),GTK_WIN_POS_CENTER );
gtk_window_set_policy( GTK_WINDOW( About ),FALSE,FALSE,TRUE );
Modified: trunk/gui/dialog/equalizer.c
==============================================================================
--- trunk/gui/dialog/equalizer.c Mon Apr 29 15:01:22 2024 (r38480)
+++ trunk/gui/dialog/equalizer.c Mon Apr 29 16:22:27 2024 (r38481)
@@ -259,7 +259,7 @@ static GtkWidget * CreateEqualizer( void
accel_group=gtk_accel_group_new();
Equalizer=gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_widget_set_usize( Equalizer,-1,256 );
+ gtk_widget_set_size_request( Equalizer,-1,256 );
gtk_window_set_title( GTK_WINDOW( Equalizer ),_(MSGTR_GUI_Equalizer) );
gtk_window_set_position( GTK_WINDOW( Equalizer ),GTK_WIN_POS_CENTER );
gtk_window_set_policy( GTK_WINDOW( Equalizer ),FALSE,FALSE,TRUE );
@@ -280,7 +280,7 @@ static GtkWidget * CreateEqualizer( void
scrolledwindow1=gtk_scrolled_window_new( NULL,NULL );
gtk_widget_show( scrolledwindow1 );
gtk_box_pack_start( GTK_BOX( hbox1 ),scrolledwindow1,FALSE,FALSE,0 );
- gtk_widget_set_usize( scrolledwindow1,106,-2 );
+ gtk_widget_set_size_request( scrolledwindow1,106,-1 );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC );
ChannelsList=gtk_clist_new( 1 );
@@ -401,22 +401,22 @@ static GtkWidget * CreateEqualizer( void
VContrastadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) );
VContrast=gtkAddHScale( VContrastadj,NULL,1 );
gtk_table_attach( GTK_TABLE( table1 ),VContrast,1,2,0,1,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- gtk_widget_set_usize( VContrast,-1,45 );
+ gtk_widget_set_size_request( VContrast,-1,45 );
VBrightnessadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) );
VBrightness=gtkAddHScale( VBrightnessadj,NULL,1 );
gtk_table_attach( GTK_TABLE( table1 ),VBrightness,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- gtk_widget_set_usize( VBrightness,-1,45 );
+ gtk_widget_set_size_request( VBrightness,-1,45 );
VHueadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) );
VHue=gtkAddHScale( VHueadj,NULL,1 );
gtk_table_attach( GTK_TABLE( table1 ),VHue,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- gtk_widget_set_usize( VHue,-1,45 );
+ gtk_widget_set_size_request( VHue,-1,45 );
VSaturationadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-100,100,1,0,0 ) );
VSaturation=gtkAddHScale( VSaturationadj,NULL,1 );
gtk_table_attach( GTK_TABLE( table1 ),VSaturation,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
- gtk_widget_set_usize( VSaturation,-1,45 );
+ gtk_widget_set_size_request( VSaturation,-1,45 );
gtk_notebook_set_tab_label( GTK_NOTEBOOK( Notebook ),gtk_notebook_get_nth_page( GTK_NOTEBOOK( Notebook ),1 ),
gtkAddLabel( _(MSGTR_GUI_Video),NULL ) );
@@ -588,7 +588,7 @@ GtkWidget * CreateEquConfig( void )
accel_group=gtk_accel_group_new();
EquConfig=gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_widget_set_usize( EquConfig,350,260 );
+ gtk_widget_set_size_request( EquConfig,350,260 );
gtk_window_set_title( GTK_WINDOW( EquConfig ),_(MSGTR_GUI_EqualizerConfiguration) );
gtk_window_set_position( GTK_WINDOW( EquConfig ),GTK_WIN_POS_CENTER );
// gtk_window_set_modal( GTK_WINDOW( EquConfig ),TRUE );
Modified: trunk/gui/dialog/fileselect.c
==============================================================================
--- trunk/gui/dialog/fileselect.c Mon Apr 29 15:01:22 2024 (r38480)
+++ trunk/gui/dialog/fileselect.c Mon Apr 29 16:22:27 2024 (r38481)
@@ -759,7 +759,7 @@ static GtkWidget *CreateFileSelect(void)
accel_group = gtk_accel_group_new();
FileSelector = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_usize(FileSelector, 512, 440);
+ gtk_widget_set_size_request(FileSelector, 512, 440);
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);
@@ -796,7 +796,7 @@ static GtkWidget *CreateFileSelect(void)
gtk_button_set_image(GTK_BUTTON(fsUp), upimage);
gtk_widget_show(fsUp);
gtk_box_pack_start(GTK_BOX(hbox4), fsUp, FALSE, FALSE, 0);
- gtk_widget_set_usize(fsUp, 60, -2);
+ gtk_widget_set_size_request(fsUp, 60, -1);
gtkAddHSeparator(vbox4);
Modified: trunk/gui/dialog/playlist.c
==============================================================================
--- trunk/gui/dialog/playlist.c Mon Apr 29 15:01:22 2024 (r38480)
+++ trunk/gui/dialog/playlist.c Mon Apr 29 16:22:27 2024 (r38481)
@@ -458,7 +458,7 @@ static GtkWidget * CreatePlaylist( void
accel_group=gtk_accel_group_new();
Playlist=gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_widget_set_usize(Playlist, 640, 480);
+ gtk_widget_set_size_request(Playlist, 640, 480);
gtk_window_set_title( GTK_WINDOW( Playlist ),_(MSGTR_GUI_Playlist) );
gtk_window_set_position( GTK_WINDOW( Playlist ),GTK_WIN_POS_CENTER );
gtk_window_set_wmclass( GTK_WINDOW( Playlist ),"Playlist",MPlayer );
Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c Mon Apr 29 15:01:22 2024 (r38480)
+++ trunk/gui/dialog/preferences.c Mon Apr 29 16:22:27 2024 (r38481)
@@ -662,7 +662,7 @@ static GtkWidget * CreatePreferences( vo
gtk_clist_set_column_width( GTK_CLIST( CLADrivers ),0,65 );
gtk_clist_column_titles_show( GTK_CLIST( CLADrivers ) );
gtk_clist_set_shadow_type( GTK_CLIST( CLADrivers ),GTK_SHADOW_NONE );
- gtk_widget_set_usize( CLADrivers,250,-2 );
+ gtk_widget_set_size_request( CLADrivers,250,-1 );
gtk_clist_set_column_widget( GTK_CLIST( CLADrivers ),0,
gtkAddLabel( _(MSGTR_GUI_AvailableDrivers),NULL ) );
@@ -672,7 +672,7 @@ static GtkWidget * CreatePreferences( vo
vbox3=gtkAddVBox(
gtkAddFrame( NULL,GTK_SHADOW_NONE,
gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox1,0 ),1 ),0 );
- gtk_widget_set_usize( vbox3,250,-2 );
+ gtk_widget_set_size_request( vbox3,250,-1 );
hbox10 = gtkAddHBox(vbox3, 1);
CBReplayGain = gtkAddCheckButton(_(MSGTR_GUI_ReplayGain), hbox10);
@@ -729,7 +729,7 @@ static GtkWidget * CreatePreferences( vo
gtk_clist_set_column_width( GTK_CLIST( CLVDrivers ),0,65 );
gtk_clist_column_titles_show( GTK_CLIST( CLVDrivers ) );
gtk_clist_set_shadow_type( GTK_CLIST( CLVDrivers ),GTK_SHADOW_NONE );
- gtk_widget_set_usize( CLVDrivers,250,-2 );
+ gtk_widget_set_size_request( CLVDrivers,250,-1 );
label=gtkAddLabel( _(MSGTR_GUI_AvailableDrivers),NULL );
gtk_clist_set_column_widget( GTK_CLIST( CLVDrivers ),0,label );
@@ -740,7 +740,7 @@ static GtkWidget * CreatePreferences( vo
vbox5=gtkAddVBox(
gtkAddFrame( NULL,GTK_SHADOW_NONE,
gtkAddFrame( NULL,GTK_SHADOW_ETCHED_OUT,hbox2,0 ),1 ),0 );
- gtk_widget_set_usize( vbox5,250,-2 );
+ gtk_widget_set_size_request( vbox5,250,-1 );
CBDoubleBuffer=gtkAddCheckButton( _(MSGTR_GUI_EnableDoubleBuffering),vbox5 );
CBDR=gtkAddCheckButton( _(MSGTR_GUI_EnableDirectRendering),vbox5 );
@@ -831,7 +831,7 @@ static GtkWidget * CreatePreferences( vo
HSSubFPSadj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,120,0.001,0,0 ) );
HSSubFPS=gtk_spin_button_new( GTK_ADJUSTMENT( HSSubFPSadj ),1,3 );
gtk_widget_show( HSSubFPS );
- gtk_widget_set_usize( HSSubFPS,60,-1 );
+ gtk_widget_set_size_request( HSSubFPS,60,-1 );
gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( HSSubFPS ),TRUE );
gtk_table_attach( GTK_TABLE( table1 ),HSSubFPS,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
@@ -1876,7 +1876,7 @@ GtkWidget * CreateDXR3Config( void )
accel_group=gtk_accel_group_new();
DXR3Config=gtk_window_new( GTK_WINDOW_TOPLEVEL );
-// gtk_widget_set_usize( DXR3Config,300,156 );
+// gtk_widget_set_size_request( DXR3Config,300,156 );
gtk_window_set_title( GTK_WINDOW( DXR3Config ),"DXR3/H+" );
gtk_window_set_position( GTK_WINDOW( DXR3Config ),GTK_WIN_POS_CENTER );
gtk_window_set_policy( GTK_WINDOW( DXR3Config ),FALSE,FALSE,TRUE );
Modified: trunk/gui/dialog/skinbrowser.c
==============================================================================
--- trunk/gui/dialog/skinbrowser.c Mon Apr 29 15:01:22 2024 (r38480)
+++ trunk/gui/dialog/skinbrowser.c Mon Apr 29 16:22:27 2024 (r38481)
@@ -98,7 +98,7 @@ void ShowSkinBrowser( void )
accel_group = gtk_accel_group_new ();
SkinBrowser=gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_widget_set_usize( SkinBrowser,256,320 );
+ gtk_widget_set_size_request( SkinBrowser,256,320 );
gtk_container_set_border_width( GTK_CONTAINER( SkinBrowser ),1 );
gtk_window_set_title( GTK_WINDOW( SkinBrowser ),_(MSGTR_GUI_SkinBrowser) );
gtk_window_set_position( GTK_WINDOW( SkinBrowser ),GTK_WIN_POS_CENTER );
Modified: trunk/gui/dialog/tools.c
==============================================================================
--- trunk/gui/dialog/tools.c Mon Apr 29 15:01:22 2024 (r38480)
+++ trunk/gui/dialog/tools.c Mon Apr 29 16:22:27 2024 (r38481)
@@ -188,7 +188,7 @@ GtkWidget * gtkAddHSeparator( GtkWidget
hseparator=gtk_hseparator_new();
gtk_widget_show( hseparator );
gtk_box_pack_start( GTK_BOX( parent ),hseparator,FALSE,FALSE,0 );
- gtk_widget_set_usize( hseparator,-2,6 );
+ gtk_widget_set_size_request( hseparator,-1,6 );
return hseparator;
}
Modified: trunk/gui/dialog/url.c
==============================================================================
--- trunk/gui/dialog/url.c Mon Apr 29 15:01:22 2024 (r38480)
+++ trunk/gui/dialog/url.c Mon Apr 29 16:22:27 2024 (r38481)
@@ -103,7 +103,7 @@ static GtkWidget *CreateURLDialog(void)
accel_group = gtk_accel_group_new();
URLDialog = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_widget_set_usize(URLDialog, 384, -1);
+ gtk_widget_set_size_request(URLDialog, 384, -1);
gtk_window_set_title(GTK_WINDOW(URLDialog), _(MSGTR_GUI_NetworkStreaming));
gtk_window_set_position(GTK_WINDOW(URLDialog), GTK_WIN_POS_CENTER);
gtk_window_set_wmclass(GTK_WINDOW(URLDialog), "Network", MPlayer);
More information about the MPlayer-cvslog
mailing list