ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Left align for the text of Labels

Browse source
This commit is contained in:
Pan7 2017-03-28 09:29:11 +02:00
parent 16453c6ac2
commit aeaa370f09
19 changed files with 243 additions and 193 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
contrib/bobtoolz/dialogs/dialogs-gtk.cpp
View file

@ -44,7 +44,7 @@ typedef struct {
dlg_texReset_t dlgTexReset;
extern void *g_pRadiantWnd;
extern GtkWidget *g_pRadiantWnd;
void Update_TextureReseter();
@ -224,6 +224,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
w = gtk_label_new( lpText );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
w = gtk_hseparator_new();
@ -430,9 +431,8 @@ int DoPolygonBox( PolygonRS* rs ){
gtk_widget_show( text1 );
sides_label = w = gtk_label_new( _( "Number Of Sides" ) );
g_object_set( w, "xalign", 0.0, NULL );
gtk_box_pack_start( GTK_BOX( hbox2 ), w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
// ---- /hbox2 ----
@ -451,9 +451,8 @@ int DoPolygonBox( PolygonRS* rs ){
gtk_widget_show( text2 );
width_label = w = gtk_label_new( _( "Border Width" ) );
g_object_set( w, "xalign", 0.0, NULL );
gtk_box_pack_start( GTK_BOX( hbox2 ), w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
// ---- /hbox2 ----
@ -1058,7 +1057,7 @@ int DoPathPlotterBox( PathPlotterRS* rs ){
w = gtk_label_new( _( "Number Of Points" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
// ---- /hbox ----
@ -1077,14 +1076,14 @@ int DoPathPlotterBox( PathPlotterRS* rs ){
w = gtk_label_new( _( "Multipler" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
// ---- /hbox ----
w = gtk_label_new( _( "Path Distance = dist(start -> apex) * multiplier" ) );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 0 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
hbox = gtk_hbox_new( FALSE, 10 );
@ -1101,7 +1100,7 @@ int DoPathPlotterBox( PathPlotterRS* rs ){
w = gtk_label_new( _( "Gravity" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
// ---- /hbox ----
@ -1300,14 +1299,14 @@ int DoResetTextureBox( ResetTextureRS* rs ){
w = gtk_label_new( texSelected );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
// ---- /hbox ----
frame = gtk_frame_new( _( "Reset Texture Names" ) );
gtk_widget_show( frame );
gtk_box_pack_start( GTK_BOX( vbox ), frame, FALSE, TRUE, 0 );
gtk_widget_show( frame );
table = gtk_table_new( 2, 3, TRUE );
@ -1330,6 +1329,7 @@ int DoResetTextureBox( ResetTextureRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
dlgTexReset.editTexOld = gtk_entry_new();
@ -1344,6 +1344,7 @@ int DoResetTextureBox( ResetTextureRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
dlgTexReset.editTexNew = gtk_entry_new();
@ -1381,6 +1382,7 @@ int DoResetTextureBox( ResetTextureRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
dlgTexReset.editScaleHor = gtk_entry_new();
@ -1403,6 +1405,7 @@ int DoResetTextureBox( ResetTextureRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
dlgTexReset.editScaleVert = gtk_entry_new();
@ -1440,6 +1443,7 @@ int DoResetTextureBox( ResetTextureRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
dlgTexReset.editShiftHor = gtk_entry_new();
@ -1462,6 +1466,7 @@ int DoResetTextureBox( ResetTextureRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
dlgTexReset.editShiftVert = gtk_entry_new();
@ -1497,6 +1502,7 @@ int DoResetTextureBox( ResetTextureRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
dlgTexReset.editRotation = gtk_entry_new();
@ -1521,16 +1527,6 @@ int DoResetTextureBox( ResetTextureRS* rs ){
gtk_size_group_add_widget( label_group, rvalue_label );
g_object_unref( label_group );
//by default text is centered in labels,
//setting text in labels left align because the label size is managed by the gtksizegroup
g_object_set( new_label, "xalign", 0.0, NULL );
g_object_set( old_label, "xalign", 0.0, NULL );
g_object_set( hscale_label, "xalign", 0.0, NULL );
g_object_set( vscale_label, "xalign", 0.0, NULL );
g_object_set( hshift_label, "xalign", 0.0, NULL );
g_object_set( vshift_label, "xalign", 0.0, NULL );
g_object_set( rvalue_label, "xalign", 0.0, NULL );
Update_TextureReseter();
@ -1659,6 +1655,7 @@ int DoTrainThingBox( TrainThingRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
radiusX = gtk_entry_new();
@ -1675,6 +1672,7 @@ int DoTrainThingBox( TrainThingRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
radiusY = gtk_entry_new();
@ -1704,6 +1702,7 @@ int DoTrainThingBox( TrainThingRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
angleStart = gtk_entry_new();
@ -1720,6 +1719,7 @@ int DoTrainThingBox( TrainThingRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
angleEnd = gtk_entry_new();
@ -1748,6 +1748,7 @@ int DoTrainThingBox( TrainThingRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
heightStart = gtk_entry_new();
@ -1764,6 +1765,7 @@ int DoTrainThingBox( TrainThingRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
heightEnd = gtk_entry_new();
@ -1793,6 +1795,7 @@ int DoTrainThingBox( TrainThingRS* rs ){
gtk_table_attach( GTK_TABLE( table ), w, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
numPoints = gtk_entry_new();

9
contrib/camera/dialogs.cpp
View file

@ -443,6 +443,7 @@ static gint ci_add_target( GtkWidget *widget, gpointer data ){
w = gtk_label_new( _( "Name:" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
name = gtk_entry_new();
@ -919,6 +920,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_label_new( _( "File:" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
g_pCamListCombo = gtk_combo_new();
@ -933,6 +935,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_label_new( _( "Name:" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
g_pCamName = gtk_entry_new();
@ -941,6 +944,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_label_new( _( "Type:" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
w = gtk_label_new( "" );
@ -974,6 +978,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_label_new( _( "Edit:" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
g_pPathListCombo = gtk_combo_new();
@ -1013,6 +1018,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_label_new( _( "Type:" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
w = gtk_label_new( "" );
@ -1068,6 +1074,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_label_new( _( "Length (seconds):" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
g_pSecondsEntry = gtk_entry_new();
@ -1083,6 +1090,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_label_new( _( "Current Time:" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
w = gtk_label_new( _( "0.00" ) );
@ -1130,6 +1138,7 @@ GtkWidget *CreateCameraInspectorDialog( void ){
w = gtk_label_new( _( "Events:" ) );
gtk_box_pack_start( GTK_BOX( hbox ), w, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_widget_show( w );
// -------------------------- //

51
contrib/gtkgensurf/gendlgs.cpp
View file

@ -1461,32 +1461,28 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Max. amplitude:" ) );
gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Roughness:" ) );
gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Random seed:" ) );
gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 3, 4,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
entry = gtk_entry_new();
@ -1554,6 +1550,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
g_object_set_data( G_OBJECT( dlg ), "hmin_text", label );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "X:" ) );
@ -1561,12 +1558,14 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
g_object_set_data( G_OBJECT( dlg ), "hmax_text", label );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Y:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "vmin_text", label );
@ -1574,6 +1573,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "vmax_text", label );
@ -1640,6 +1640,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "nh_text", label );
@ -1647,6 +1648,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "nv_text", label );
@ -1681,6 +1683,7 @@ GtkWidget* create_main_dialog(){
// ^Fishman - Snap to grid, replaced scroll bar with a texbox.
label = gtk_label_new( _( "Snap to grid:" ) );
gtk_box_pack_start( GTK_BOX( vbox ), label, FALSE, TRUE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "snap_text", label );
@ -1700,6 +1703,7 @@ GtkWidget* create_main_dialog(){
label = gtk_label_new( _( "Decimate:" ) );
gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, TRUE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, 0, 110, 1, 10, 0 ) );
@ -1728,24 +1732,28 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Lower-left:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Upper-right:" ) );
gtk_widget_show( label );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Lower-right:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
entry = gtk_entry_new();
@ -1802,6 +1810,7 @@ GtkWidget* create_main_dialog(){
label = gtk_label_new( "" );
gtk_box_pack_start( GTK_BOX( vbox ), label, FALSE, TRUE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "bmp_note", label );
@ -1816,6 +1825,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "bmp_text1", label );
@ -1856,8 +1866,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL | GTK_EXPAND ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "bmp_text2", label );
@ -1866,8 +1875,7 @@ GtkWidget* create_main_dialog(){
(GtkAttachOptions) ( GTK_FILL | GTK_EXPAND ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
g_object_set_data( G_OBJECT( dlg ), "bmp_text3", label );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_RIGHT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
hbox2 = gtk_hbox_new( FALSE, 5 );
@ -1911,6 +1919,8 @@ GtkWidget* create_main_dialog(){
"Click \"Free\" to unlock a vertex. Vertices within \"Range\n"
"affected\" will be influenced by this vertex." ) );
gtk_box_pack_start( GTK_BOX( vbox ), label, FALSE, TRUE, 0 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
table = gtk_table_new( 3, 3, FALSE );
@ -1924,7 +1934,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "fix_value_text", label );
@ -1932,7 +1942,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "fix_range_text", label );
@ -1940,7 +1950,7 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
g_object_set_data( G_OBJECT( dlg ), "fix_rate_text", label );
@ -2008,21 +2018,21 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Other:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Steep:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
entry = gtk_entry_new();
@ -2054,6 +2064,7 @@ GtkWidget* create_main_dialog(){
label = gtk_label_new( _( "\"Steep\" angle:" ) );
gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, TRUE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
adj = GTK_ADJUSTMENT( gtk_adjustment_new( 60, 0, 90, 1, 10, 0 ) );
@ -2074,12 +2085,14 @@ GtkWidget* create_main_dialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 2, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
scale_label = label = gtk_label_new( _( "Scale <h,v>" ) );
gtk_table_attach( GTK_TABLE( table ), label, 2, 4, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
entry = gtk_entry_new();

5
contrib/gtkgensurf/view.cpp
View file

@ -389,8 +389,7 @@ void CreateViewWindow(){
gtk_widget_show( hbox );
label = gtk_label_new( _( "Elevation" ) );
g_object_set( label, "xalign", 1.0, NULL );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_box_pack_start( GTK_BOX( hbox ), label, FALSE, TRUE, 0 );
gtk_widget_show( label );
@ -413,7 +412,7 @@ void CreateViewWindow(){
gtk_widget_show( spin );
label = gtk_label_new( _( "Azimuth" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_box_pack_end( GTK_BOX( hbox ), label, FALSE, TRUE, 0 );
gtk_widget_show( label );
g_signal_connect( G_OBJECT( spin ), "focus-out-event", G_CALLBACK( doublevariable_spinfocusout ), &azimuth );

1
contrib/prtview/AboutDialog.cpp
View file

@ -54,6 +54,7 @@ void DoAboutDlg( GtkWidget *parent ){
);
gtk_box_pack_start( GTK_BOX( vbox ), label, TRUE, TRUE, 0 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );

4
contrib/prtview/ConfigDialog.cpp
View file

@ -400,7 +400,7 @@ void DoConfigDialog( GtkWidget *parent ){
gtk_table_attach( GTK_TABLE( table ), translabel, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( translabel ), 0.0, 0.0 );
gtk_misc_set_alignment( GTK_MISC( translabel ), 0.0, 0.5 );
gtk_widget_show( translabel );
g_signal_connect( adj, "value-changed", G_CALLBACK( OnScrollTrans ), translabel );
@ -416,7 +416,7 @@ void DoConfigDialog( GtkWidget *parent ){
gtk_table_attach( GTK_TABLE( table ), cliplabel, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( cliplabel ), 0.0, 0.0 );
gtk_misc_set_alignment( GTK_MISC( cliplabel ), 0.0, 0.5 );
gtk_widget_show( cliplabel );
g_signal_connect( adj, "value-changed", G_CALLBACK( OnScrollClip ), cliplabel );

26
plugins/surface/surfacedialog.cpp
View file

@ -671,7 +671,7 @@ GtkWidget* create_SurfaceInspector( void ){
label = gtk_label_new( _( "Texture: " ) );
gtk_box_pack_start( GTK_BOX( hbox1 ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
texture_combo = gtk_combo_new();
@ -804,6 +804,7 @@ GtkWidget* create_SurfaceInspector( void ){
gtk_widget_show( hseparator );
label = gtk_label_new( _( "Step" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table1 ), label, 3, 4, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -823,7 +824,7 @@ GtkWidget* create_SurfaceInspector( void ){
gtk_table_attach( GTK_TABLE( table1 ), label, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.5, 1 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
hseparator = gtk_hseparator_new();
@ -864,8 +865,7 @@ GtkWidget* create_SurfaceInspector( void ){
label = gtk_label_new( _( "Vertical Shift: " ) );
gtk_container_add( GTK_CONTAINER( eventbox ), label );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
eventbox = gtk_event_box_new();
@ -876,8 +876,7 @@ GtkWidget* create_SurfaceInspector( void ){
label = gtk_label_new( _( "Horizontal Scale: " ) );
gtk_container_add( GTK_CONTAINER( eventbox ), label );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
eventbox = gtk_event_box_new();
@ -888,8 +887,7 @@ GtkWidget* create_SurfaceInspector( void ){
label = gtk_label_new( _( "Vertical Scale: " ) );
gtk_container_add( GTK_CONTAINER( eventbox ), label );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
eventbox = gtk_event_box_new();
@ -900,8 +898,7 @@ GtkWidget* create_SurfaceInspector( void ){
label = gtk_label_new( _( "Rotate: " ) );
gtk_container_add( GTK_CONTAINER( eventbox ), label );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
eventbox = gtk_event_box_new();
@ -912,8 +909,7 @@ GtkWidget* create_SurfaceInspector( void ){
label = gtk_label_new( _( "Horizontal Shift: " ) );
gtk_container_add( GTK_CONTAINER( eventbox ), label );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
hseparator = gtk_hseparator_new();
@ -1086,16 +1082,14 @@ GtkWidget* create_SurfaceInspector( void ){
gtk_table_attach( GTK_TABLE( table5 ), label, 2, 3, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.5, 1 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Width" ) );
gtk_table_attach( GTK_TABLE( table5 ), label, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.5, 1 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
fit_width_spinbutton_adj = GTK_ADJUSTMENT( gtk_adjustment_new( 1, 1, 32, 1, 10, 0 ) );

13
plugins/surface_idtech2/surfacedialog.cpp
View file

@ -567,7 +567,7 @@ GtkWidget* create_SurfaceInspector( void ){
label = gtk_label_new( _( "Texture: " ) );
gtk_box_pack_start( GTK_BOX( hbox1 ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
texture_combo = gtk_combo_new();
@ -596,43 +596,49 @@ GtkWidget* create_SurfaceInspector( void ){
gtk_table_attach( GTK_TABLE( table1 ), label, 2, 3, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Value" ) );
gtk_table_attach( GTK_TABLE( table1 ), label, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.5, 1 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Horizontal shift: " ) );
gtk_table_attach( GTK_TABLE( table1 ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Vertical shift: " ) );
gtk_table_attach( GTK_TABLE( table1 ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Horizontal scale: " ) );
gtk_table_attach( GTK_TABLE( table1 ), label, 0, 1, 3, 4,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Vertical scale: " ) );
gtk_table_attach( GTK_TABLE( table1 ), label, 0, 1, 4, 5,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Rotate: " ) );
gtk_table_attach( GTK_TABLE( table1 ), label, 0, 1, 5, 6,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// Value Spins
@ -769,18 +775,21 @@ GtkWidget* create_SurfaceInspector( void ){
gtk_table_attach( GTK_TABLE( table2 ), label, 3, 4, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Width" ) );
gtk_table_attach( GTK_TABLE( table2 ), label, 2, 3, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Brush" ) );
gtk_table_attach( GTK_TABLE( table2 ), label, 0, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
adjustment = GTK_ADJUSTMENT( gtk_adjustment_new( 1, 1, 32, 1, 10, 0 ) );

1
plugins/surface_idtech2/surfaceflags.cpp
View file

@ -361,6 +361,7 @@ GtkWidget* create_SurfaceFlagsFrame( GtkWidget* surfacedialog_widget ){
value_label = gtk_label_new( _( "Value: " ) );
gtk_box_pack_start( GTK_BOX( hbox3 ), value_label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( value_label ), 0.0, 0.5 );
gtk_widget_show( value_label );
value_entry = gtk_entry_new();

1
plugins/textool/TexTool.cpp
View file

@ -124,6 +124,7 @@ int DoMessageBox( const char* lpText, const char* lpCaption, guint32 uType ){
w = gtk_label_new( lpText );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 2 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_label_set_selectable( GTK_LABEL( w ), TRUE );
gtk_widget_show( w );

1
radiant/bp_dlg.cpp
View file

@ -71,6 +71,7 @@ int BP_MessageBox( int status ){
"in the same maps for a smooth transition." ) );
}
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 2 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_widget_show( w );

4
radiant/findtexturedialog.cpp
View file

@ -131,14 +131,14 @@ void FindTextureDialog::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Replace:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
entry = gtk_entry_new();

90
radiant/groupdialog.cpp
View file

@ -1237,20 +1237,20 @@ void GroupDlg::Create(){
{
GtkWidget* notebook = gtk_notebook_new();
gtk_widget_show( notebook );
gtk_container_add( GTK_CONTAINER( dlg ), notebook );
gtk_notebook_set_tab_pos( GTK_NOTEBOOK( notebook ), GTK_POS_BOTTOM );
gtk_widget_show( notebook );
m_pNotebook = notebook;
{
GtkWidget* vbox = gtk_vbox_new( FALSE, 2 );
gtk_widget_show( vbox );
gtk_container_set_border_width( GTK_CONTAINER( vbox ), 2 );
gtk_widget_show( vbox );
{
GtkWidget* label = gtk_label_new( _( "Entities" ) );
gtk_widget_show( label );
gtk_notebook_append_page( GTK_NOTEBOOK( notebook ), vbox, label );
gtk_widget_show( label );
}
{
@ -1268,15 +1268,15 @@ void GroupDlg::Create(){
{
GtkWidget* vbox2 = gtk_vbox_new( FALSE, 2 );
gtk_widget_show( vbox2 );
gtk_paned_pack2( GTK_PANED( split1 ), vbox2, FALSE, FALSE );
gtk_widget_show( vbox2 );
{
GtkWidget* scr = gtk_scrolled_window_new( NULL, NULL );
gtk_widget_show( scr );
gtk_paned_add1( GTK_PANED( split2 ), scr );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scr ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS );
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN );
gtk_widget_show( scr );
{
GtkListStore* store = gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_POINTER );
@ -1309,18 +1309,18 @@ void GroupDlg::Create(){
{
GtkWidget* scr = gtk_scrolled_window_new( NULL, NULL );
gtk_widget_show( scr );
gtk_paned_add2( GTK_PANED( split2 ), scr );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scr ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS );
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN );
gtk_widget_show( scr );
{
GtkWidget* text = gtk_text_view_new();
gtk_widget_set_size_request( text, 0, -1 ); // allow shrinking
gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW( text ), GTK_WRAP_WORD );
gtk_text_view_set_editable( GTK_TEXT_VIEW( text ), FALSE );
gtk_widget_show( text );
gtk_container_add( GTK_CONTAINER( scr ), text );
gtk_widget_show( text );
EntWidgets[EntComment] = text;
}
}
@ -1343,10 +1343,10 @@ void GroupDlg::Create(){
{
GtkWidget* scr = gtk_scrolled_window_new( NULL, NULL );
gtk_widget_show( scr );
gtk_box_pack_start( GTK_BOX( vbox2 ), scr, TRUE, TRUE, 0 );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scr ), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN );
gtk_widget_show( scr );
{
GtkListStore* store = gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_STRING );
@ -1371,10 +1371,10 @@ void GroupDlg::Create(){
g_signal_connect( G_OBJECT( selection ), "changed", G_CALLBACK( proplist_selection_changed ), dlg );
}
gtk_widget_show( view );
gtk_container_add( GTK_CONTAINER( scr ), view );
gtk_widget_show( view );
g_object_unref( G_OBJECT( store ) );
EntWidgets[EntProps] = view;
@ -1399,17 +1399,17 @@ void GroupDlg::Create(){
{
GtkWidget* table = gtk_table_new( 2, 2, FALSE );
gtk_widget_show( table );
gtk_box_pack_start( GTK_BOX( vbox ), table, FALSE, TRUE, 0 );
gtk_table_set_row_spacings( GTK_TABLE( table ), 3 );
gtk_table_set_col_spacings( GTK_TABLE( table ), 5 );
gtk_widget_show( table );
{
GtkWidget* entry = gtk_entry_new();
gtk_widget_show( entry );
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_show( entry );
gtk_widget_set_events( entry, GDK_KEY_PRESS_MASK );
g_signal_connect( G_OBJECT( entry ), "key-press-event",
G_CALLBACK( entityentry_keypress ), this );
@ -1418,10 +1418,10 @@ void GroupDlg::Create(){
{
GtkWidget* entry = gtk_entry_new();
gtk_widget_show( entry );
gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_show( entry );
gtk_widget_set_events( entry, GDK_KEY_PRESS_MASK );
g_signal_connect( G_OBJECT( entry ), "key-press-event",
G_CALLBACK( entityentry_keypress ), this );
@ -1430,111 +1430,111 @@ void GroupDlg::Create(){
{
GtkWidget* label = gtk_label_new( _( "Value" ) );
gtk_widget_show( label );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
}
{
GtkWidget* label = gtk_label_new( _( "Key" ) );
gtk_widget_show( label );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
}
}
{
GtkWidget* hbox = gtk_hbox_new( FALSE, 5 );
gtk_widget_show( hbox );
gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, TRUE, 0 );
gtk_widget_show( hbox );
{
GtkWidget* table = gtk_table_new( 3, 3, TRUE );
gtk_widget_show( table );
gtk_box_pack_start( GTK_BOX( hbox ), table, FALSE, TRUE, 0 );
gtk_widget_show( table );
{
GtkWidget* button = gtk_button_new_with_label( _( "360" ) );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"360" );
gtk_table_attach( GTK_TABLE( table ), button, 2, 3, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"360" );
}
{
GtkWidget* button = gtk_button_new_with_label( _( "45" ) );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"45" );
gtk_table_attach( GTK_TABLE( table ), button, 2, 3, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"45" );
}
{
GtkWidget* button = gtk_button_new_with_label( _( "90" ) );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"90" );
gtk_table_attach( GTK_TABLE( table ), button, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"90" );
}
{
GtkWidget* button = gtk_button_new_with_label( _( "135" ) );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"135" );
gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"135" );
}
{
GtkWidget* button = gtk_button_new_with_label( _( "180" ) );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"180" );
gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"180" );
}
{
GtkWidget* button = gtk_button_new_with_label( _( "225" ) );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"225" );
gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"225" );
}
{
GtkWidget* button = gtk_button_new_with_label( _( "270" ) );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"270" );
gtk_table_attach( GTK_TABLE( table ), button, 1, 2, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"270" );
}
{
GtkWidget* button = gtk_button_new_with_label( _( "315" ) );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"315" );
gtk_table_attach( GTK_TABLE( table ), button, 2, 3, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( GTK_FILL ), 0, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"315" );
}
}
{
GtkWidget* vbox2 = gtk_vbox_new( FALSE, 0 );
gtk_widget_show( vbox2 );
gtk_box_pack_start( GTK_BOX( hbox ), vbox2, TRUE, TRUE, 0 );
gtk_widget_show( vbox2 );
{
GtkWidget* button = gtk_button_new_with_label( _( "Reset" ) );
@ -1545,56 +1545,58 @@ void GroupDlg::Create(){
{
GtkWidget* button = gtk_button_new_with_label( _( "Up" ) );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"-1" );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
}
{
GtkWidget* button = gtk_button_new_with_label( _( "Dn" ) );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( entitylist_angle ), (void *)"-2" );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
}
}
{
GtkWidget* vbox2 = gtk_vbox_new( FALSE, 0 );
gtk_widget_show( vbox2 );
gtk_box_pack_start( GTK_BOX( hbox ), vbox2, TRUE, TRUE, 0 );
gtk_widget_show( vbox2 );
{
GtkWidget* button = gtk_button_new_with_label( _( "Del Key/Pair" ) );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( DelProp ), NULL );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
}
{
GtkWidget* button = gtk_button_new_with_label( _( "Sound..." ) );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( AssignSound ), NULL );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
}
{
GtkWidget* button = gtk_button_new_with_label( _( "Model..." ) );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( AssignModel ), NULL );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
}
}
{
GtkWidget* vbox2 = gtk_vbox_new( FALSE, 0 );
gtk_widget_show( vbox2 );
gtk_box_pack_start( GTK_BOX( hbox ), vbox2, TRUE, TRUE, 0 );
gtk_widget_show( vbox2 );
{
GtkWidget* button = gtk_button_new_with_label( _( "Cam to angles" ) );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
gtk_widget_show( button );
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( cam2angles ), NULL );
gtk_box_pack_start( GTK_BOX( vbox2 ), button, FALSE, FALSE, 0 );
}
}
}
@ -1605,8 +1607,8 @@ void GroupDlg::Create(){
GtkWidget* scr = gtk_scrolled_window_new( NULL, NULL );
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scr ), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC );
gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN );
gtk_widget_show( scr );
gtk_container_set_border_width( GTK_CONTAINER( scr ), 3 );
gtk_widget_show( scr );
{
GtkWidget* text = gtk_text_view_new();

85
radiant/gtkdlgs.cpp
View file

@ -144,14 +144,14 @@ static void DoProjectAddEdit( bool edit, GtkWidget *parent ){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Command" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
text = gtk_entry_new();
@ -658,7 +658,7 @@ void DoProjectSettings(){
gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 8, 9,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 1.0, 0.5 );
gamemode = ValueForKey( g_qeglobals.d_project_entity, "gamemode" );
isBasemode = qtrue;
@ -699,7 +699,7 @@ void DoProjectSettings(){
gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
@ -707,14 +707,14 @@ void DoProjectSettings(){
gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 6, 7,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "fs_game" ) );
gtk_table_attach( GTK_TABLE( table2 ), label, 0, 1, 7, 8,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// Initialize fields
@ -881,49 +881,49 @@ void DoMapInfo(){
gtk_table_attach( GTK_TABLE( table ), brushes_label, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
g_object_set( brushes_label, "xalign", 1.0, NULL );
gtk_misc_set_alignment( GTK_MISC( brushes_label ), 1.0, 0.5 );
gtk_widget_show( brushes_label );
entities_label = gtk_label_new( "" );
gtk_table_attach( GTK_TABLE( table ), entities_label, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
g_object_set( entities_label, "xalign", 1.0, NULL );
gtk_misc_set_alignment( GTK_MISC( entities_label ), 1.0, 0.5 );
gtk_widget_show( entities_label );
net_label = gtk_label_new( "" );
gtk_table_attach( GTK_TABLE( table ), net_label, 1, 2, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
g_object_set( net_label, "xalign", 1.0, NULL );
gtk_misc_set_alignment( GTK_MISC( net_label ), 1.0, 0.5 );
gtk_widget_show( net_label );
label = gtk_label_new( _( "Total Brushes" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Total Entities" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Net brush count\n(non entity)" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Entity breakdown" ) );
gtk_box_pack_start( GTK_BOX( vbox ), label, FALSE, TRUE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
scr = gtk_scrolled_window_new( (GtkAdjustment*)NULL, (GtkAdjustment*)NULL );
@ -1333,12 +1333,14 @@ void DoRotateDlg(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Y" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Z" ) );
@ -1346,6 +1348,7 @@ void DoRotateDlg(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -359, 359, 1, 10, 0 ) );
@ -1415,12 +1418,12 @@ void DoGamma(){
gtk_widget_show( vbox );
label = gtk_label_new( _( "0.0 is brightest\n1.0 is darkest" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_box_pack_start( GTK_BOX( vbox ), label, TRUE, TRUE, 0 );
gtk_widget_show( label );
label = gtk_label_new( _( "You must restart for the\nsettings to take effect" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_box_pack_start( GTK_BOX( vbox ), label, TRUE, TRUE, 0 );
gtk_widget_show( label );
@ -1634,12 +1637,14 @@ void DoFind(){
gtk_widget_show( table );
label = gtk_label_new( _( "Entity number" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_show( label );
label = gtk_label_new( _( "Brush number" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -1702,6 +1707,7 @@ void DoSides( bool bCone, bool bSphere, bool bTorus ){
label = gtk_label_new( _( "Sides:" ) );
gtk_box_pack_start( GTK_BOX( hbox ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
adj = GTK_ADJUSTMENT( gtk_adjustment_new( 3, 3, 100, 1, 10, 0 ) );
@ -1765,14 +1771,14 @@ void DoNewPatchDlg(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Height:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
combo_list = (GList*)NULL;
@ -1794,7 +1800,8 @@ void DoNewPatchDlg(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_show( combo );
// g_object_set( combo, "xalign", 1.0, NULL );
//right align the combo elements
cells = gtk_cell_layout_get_cells( GTK_CELL_LAYOUT( combo ) );
for( lst = cells; lst != NULL; lst = g_list_next( lst ) )
{
@ -1812,7 +1819,7 @@ void DoNewPatchDlg(){
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_widget_show( combo );
// g_object_set( combo, "xalign", 1.0, NULL );
cells = gtk_cell_layout_get_cells( GTK_CELL_LAYOUT( combo ) );
for( lst = cells; lst != NULL; lst = g_list_next( lst ) )
{
@ -1909,21 +1916,21 @@ void DoScaleDlg(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Y:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Z:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
adj = GTK_ADJUSTMENT( gtk_adjustment_new( 1.0, 0, 100, 0.1, 1, 0 ) );
@ -2000,6 +2007,7 @@ void DoThickenDlg(){
"that contains the original patch along with the\n"
"'thick' patch and an optimal set of seam patches." ) );
gtk_box_pack_start( GTK_BOX( hbox ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
hbox = gtk_hbox_new( FALSE, 5 );
@ -2008,6 +2016,7 @@ void DoThickenDlg(){
label = gtk_label_new( _( "Amount:" ) );
gtk_box_pack_start( GTK_BOX( hbox ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
adj = GTK_ADJUSTMENT( gtk_adjustment_new( 1, 1, 100, 1, 10, 0 ) );
@ -2015,6 +2024,7 @@ void DoThickenDlg(){
gtk_box_pack_start( GTK_BOX( hbox ), amount, FALSE, FALSE, 0 );
gtk_spin_button_set_wrap( GTK_SPIN_BUTTON( spin ), FALSE );
gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( spin ), TRUE );
gtk_entry_set_alignment( GTK_ENTRY( spin ), 1.0 ); //right
gtk_widget_show( spin );
@ -2123,6 +2133,7 @@ void DoAbout(){
gtk_box_pack_start( GTK_BOX( info_hbox ), info_label, FALSE, FALSE, 0 );
gtk_label_set_justify( GTK_LABEL( info_label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( info_label ), 0.0, 0.5 );
gtk_label_set_selectable( GTK_LABEL( info_label ), TRUE );
gtk_widget_show( info_label );
@ -2142,28 +2153,28 @@ void DoAbout(){
gtk_table_attach( GTK_TABLE( gl_prop_table ), vendor_label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( vendor_label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( vendor_label ), 0.0, 0.5 );
gtk_widget_show( vendor_label );
GtkWidget *version_label = gtk_label_new( _( "Version:" ) );
gtk_table_attach( GTK_TABLE( gl_prop_table ), version_label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( version_label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( version_label ), 0.0, 0.5 );
gtk_widget_show( version_label );
GtkWidget *renderer_label = gtk_label_new( _( "Renderer:" ) );
gtk_table_attach( GTK_TABLE( gl_prop_table ), renderer_label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( renderer_label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( renderer_label ), 0.0, 0.5 );
gtk_widget_show( renderer_label );
GtkWidget *gl_vendor_label = gtk_label_new( (char*)qglGetString( GL_VENDOR ) );
gtk_table_attach( GTK_TABLE( gl_prop_table ), gl_vendor_label, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( gl_vendor_label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( gl_vendor_label ), 0.0, 0.5 );
gtk_label_set_selectable( GTK_LABEL( gl_vendor_label ), TRUE );
gtk_widget_show( gl_vendor_label );
@ -2171,7 +2182,7 @@ void DoAbout(){
gtk_table_attach( GTK_TABLE( gl_prop_table ), gl_version_label, 1, 2, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( gl_version_label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( gl_version_label ), 0.0, 0.5 );
gtk_label_set_selectable( GTK_LABEL( gl_version_label ), TRUE );
gtk_widget_show( gl_version_label );
@ -2179,7 +2190,7 @@ void DoAbout(){
gtk_table_attach( GTK_TABLE( gl_prop_table ), gl_renderer_label, 1, 2, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( gl_renderer_label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( gl_renderer_label ), 0.0, 0.5 );
gtk_label_set_selectable( GTK_LABEL( gl_renderer_label ), TRUE );
gtk_widget_show( gl_renderer_label );
@ -2421,7 +2432,6 @@ void DoTextureListDlg(){
gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column );
}
gtk_widget_show( view );
gtk_container_add( GTK_CONTAINER( scr ), view );
{
@ -2441,6 +2451,7 @@ void DoTextureListDlg(){
}
g_object_unref( G_OBJECT( store ) );
gtk_widget_show( view );
texture_list = view;
g_object_set_data( G_OBJECT( dialog ), "view", view );
@ -2612,7 +2623,7 @@ void DoScriptsDlg(){
"that Radiant will crash. Save your work before attempting to\n"
"make use of any scripting features." ) );
gtk_box_pack_start( GTK_BOX( vbox ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_widget_show( label );
@ -2761,7 +2772,7 @@ int DoBSInputDlg( const char *fields[5], float values[5] ){
label = gtk_label_new( fields[i] );
gtk_box_pack_start( GTK_BOX( vbox ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 1.0, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_widget_show( label );
@ -2832,7 +2843,7 @@ int DoTextureLayout( float *fx, float *fy ){
"will \"fit\" the texture. 2x2 will repeat\n"
"it twice, etc." ) );
gtk_box_pack_start( GTK_BOX( vbox ), label, TRUE, TRUE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_widget_show( label );
@ -2846,14 +2857,14 @@ int DoTextureLayout( float *fx, float *fy ){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Texture y:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
x = gtk_entry_new();
@ -2995,7 +3006,7 @@ char* DoNewProjectDlg(){
label = gtk_label_new( _( "This will create a new directory beneath your\n"
"game path based on the project name you give." ) );
gtk_box_pack_start( GTK_BOX( vbox ), label, TRUE, TRUE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_widget_show( label );
@ -3003,7 +3014,7 @@ char* DoNewProjectDlg(){
gtk_box_pack_start( GTK_BOX( vbox ), label, TRUE, TRUE, 0 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
entry = gtk_entry_new();
@ -3375,7 +3386,7 @@ int DoLightIntensityDlg( int *intensity ){
label = gtk_label_new( _( "ESC for default, ENTER to validate" ) );
gtk_box_pack_start( GTK_BOX( vbox ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
hbox = gtk_hbox_new( TRUE, 5 );

2
radiant/gtkmisc.cpp
View file

@ -922,6 +922,7 @@ int WINAPI gtk_MessageBoxNew( void *parent, const char *message,
// add message
GtkWidget *dlg_msg = gtk_label_new( message );
gtk_box_pack_start( GTK_BOX( icon_text_hbox ), dlg_msg, FALSE, FALSE, MSGBOX_PAD_MINOR );
gtk_misc_set_alignment( GTK_MISC( dlg_msg ), 0.0, 0.5 );
gtk_label_set_justify( GTK_LABEL( dlg_msg ), GTK_JUSTIFY_LEFT );
gtk_label_set_selectable( GTK_LABEL( dlg_msg ), TRUE );
gtk_widget_show( dlg_msg );
@ -1045,6 +1046,7 @@ int WINAPI gtk_MessageBox( void *parent, const char* lpText, const char* lpCapti
w = gtk_label_new( lpText );
gtk_box_pack_start( GTK_BOX( vbox ), w, FALSE, FALSE, 2 );
gtk_misc_set_alignment( GTK_MISC( w ), 0.0, 0.5 );
gtk_label_set_justify( GTK_LABEL( w ), GTK_JUSTIFY_LEFT );
gtk_label_set_selectable( GTK_LABEL( w ), TRUE );
gtk_widget_show( w );

4
radiant/mainframe.cpp
View file

@ -2003,8 +2003,7 @@ void MainFrame::create_main_statusbar( GtkWidget *window, GtkWidget *vbox ){
label = gtk_label_new( _( " Label " ) );
gtk_box_pack_start( GTK_BOX( hbox1 ), label, FALSE, TRUE, 0 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_padding( GTK_MISC( label ), 3, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
m_pStatusLabel[0] = label;
@ -2017,6 +2016,7 @@ void MainFrame::create_main_statusbar( GtkWidget *window, GtkWidget *vbox ){
label = gtk_label_new( _( " Label " ) );
gtk_container_add( GTK_CONTAINER( frame ), label );
gtk_misc_set_padding( GTK_MISC( label ), 3, 0 );
gtk_widget_show( label );
m_pStatusLabel[i] = label;
}

20
radiant/patchdialog.cpp
View file

@ -333,12 +333,14 @@ void PatchDialog::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
col_label = label = gtk_label_new( _( "Column:" ) );
gtk_table_attach( GTK_TABLE( table ), label, 1, 2, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
size_group = gtk_size_group_new( GTK_SIZE_GROUP_BOTH );
@ -382,6 +384,7 @@ void PatchDialog::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_set_tooltip_text( label, _( "X-Axis" ) );
gtk_widget_show( label );
@ -389,6 +392,7 @@ void PatchDialog::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_set_tooltip_text( label, _( "Y-Axis" ) );
gtk_widget_show( label );
@ -396,6 +400,7 @@ void PatchDialog::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_set_tooltip_text( label, _( "Z-Axis" ) );
gtk_widget_show( label );
@ -403,6 +408,7 @@ void PatchDialog::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 3, 4,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_set_tooltip_text( label, _( "S-coordinates correspond to the \"x\" coordinates on the texture itself" ) );
gtk_widget_show( label );
@ -410,6 +416,7 @@ void PatchDialog::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 4, 5,
(GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_set_tooltip_text( label, _( "T-coordinates correspond to the \"y\" coordinates on the texture itself. The measurements are in game units." ) );
gtk_widget_show( label );
@ -479,8 +486,7 @@ void PatchDialog::BuildDialog(){
label = gtk_label_new( _( "Name:" ) );
gtk_box_pack_start( GTK_BOX( vbox2 ), label, TRUE, TRUE, 0 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
entry = gtk_entry_new();
@ -499,35 +505,35 @@ void PatchDialog::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Vertical Shift Step" ) );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Horizontal Stretch Step" ) );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Vertical Stretch Step" ) );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 3, 4,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Rotate Step" ) );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 4, 5,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -INT_MAX, INT_MAX, 1, 10, 0 ) );

49
radiant/preferences.cpp
View file

@ -1071,6 +1071,7 @@ GtkWidget* CGameDialog::GetGlobalFrame(){
text = gtk_label_new( _( "(use preferences to undo this)" ) );
gtk_box_pack_start( GTK_BOX( vbox ), text, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( text ), 0.0, 0.5 );
gtk_widget_show( text );
#ifdef _WIN32
@ -1836,8 +1837,8 @@ void PrefsDlg::BuildDialog(){
// label
label = gtk_label_new( _( "Movement Velocity" ) );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// adjustment
@ -1859,8 +1860,8 @@ void PrefsDlg::BuildDialog(){
// label
label = gtk_label_new( _( "Rotational Velocity" ) );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// adjustment
@ -1882,11 +1883,13 @@ void PrefsDlg::BuildDialog(){
// label
label = gtk_label_new( _( "slow" ) );
gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// label
label = gtk_label_new( _( "fast" ) );
gtk_box_pack_end( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1.0, 0.5 );
gtk_widget_show( label );
// Allow drag to select multiple faces/brushes
@ -1898,10 +1901,10 @@ void PrefsDlg::BuildDialog(){
gtk_widget_show( table );
label = gtk_label_new( _( "Use paint-select in camera view:" ) );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
combo_list = NULL;
@ -1921,35 +1924,30 @@ void PrefsDlg::BuildDialog(){
// Freelook in Camera view
check = gtk_check_button_new_with_label( _( "Freelook in Camera view" ) );
gtk_box_pack_start( GTK_BOX( vbox ), check, FALSE, FALSE, 0 );
gtk_label_set_justify( GTK_LABEL( GTK_BIN( check )->child ), GTK_JUSTIFY_LEFT );
gtk_widget_show( check );
AddDialogData( check, &m_bCamFreeLook, DLG_CHECK_BOOL );
// Freelook in Camera view w/ forward & back strafing instead of up and down looking
check = gtk_check_button_new_with_label( _( "Freelook strafes Forward and Back" ) );
gtk_box_pack_start( GTK_BOX( vbox ), check, FALSE, FALSE, 0 );
gtk_label_set_justify( GTK_LABEL( GTK_BIN( check )->child ), GTK_JUSTIFY_LEFT );
gtk_widget_show( check );
AddDialogData( check, &m_bCamFreeLookStrafe, DLG_CHECK_BOOL );
// Invert mouse in freelook
check = gtk_check_button_new_with_label( _( "Invert mouse in freelook" ) );
gtk_box_pack_start( GTK_BOX( vbox ), check, FALSE, FALSE, 0 );
gtk_label_set_justify( GTK_LABEL( GTK_BIN( check )->child ), GTK_JUSTIFY_LEFT );
gtk_widget_show( check );
AddDialogData( check, &m_bCamInverseMouse, DLG_CHECK_BOOL );
// Discrete movement
check = gtk_check_button_new_with_label( _( "Discrete movement" ) );
gtk_box_pack_start( GTK_BOX( vbox ), check, FALSE, FALSE, 0 );
gtk_label_set_justify( GTK_LABEL( GTK_BIN( check )->child ), GTK_JUSTIFY_LEFT );
gtk_widget_show( check );
AddDialogData( check, &m_bCamDiscrete, DLG_CHECK_BOOL );
// Update XY views on camera move
check = gtk_check_button_new_with_label( _( "Update XY views on camera move" ) );
gtk_box_pack_start( GTK_BOX( vbox ), check, FALSE, FALSE, 0 );
gtk_label_set_justify( GTK_LABEL( GTK_BIN( check )->child ), GTK_JUSTIFY_LEFT );
gtk_widget_show( check );
AddDialogData( check, &m_bCamXYUpdate, DLG_CHECK_BOOL );
@ -1971,8 +1969,7 @@ void PrefsDlg::BuildDialog(){
// label
label = gtk_label_new( _( "Texture quality" ) );
gtk_box_pack_start( GTK_BOX( vbox ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// adjustment
@ -1992,10 +1989,12 @@ void PrefsDlg::BuildDialog(){
label = gtk_label_new( _( "low" ) );
gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "high" ) );
gtk_box_pack_end( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1.0, 0.5 );
gtk_widget_show( label );
// texture subsets
@ -2026,12 +2025,10 @@ void PrefsDlg::BuildDialog(){
gtk_widget_show( table );
label = gtk_label_new( _( "Texture Compression (if available):" ) );
g_object_set( label, "xalign", 0.0, NULL );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// Texture compression choice label
@ -2072,12 +2069,10 @@ void PrefsDlg::BuildDialog(){
// Startup shaders
// label
label = gtk_label_new( _( "Startup Shaders:" ) );
g_object_set( label, "xalign", 0.0, NULL );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// combo list
@ -2295,6 +2290,7 @@ void PrefsDlg::BuildDialog(){
// label
label = gtk_label_new( _( "Wheel Mouse inc:" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 );
gtk_widget_show( label );
@ -2368,6 +2364,7 @@ void PrefsDlg::BuildDialog(){
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// entry
@ -2382,10 +2379,10 @@ void PrefsDlg::BuildDialog(){
// Undo levels
// label
label = gtk_label_new( _( "Undo Levels:" ) );
g_object_set( label, "xalign", 0.0, NULL );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// spinner (allows undo levels to be set to zero)
@ -2401,10 +2398,10 @@ void PrefsDlg::BuildDialog(){
// Patch subdivisions
// label
label = gtk_label_new( _( "Patch subdivisions:" ) );
g_object_set( label, "xalign", 0.0, NULL );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// entry (spinner perhaps? [2-16])
@ -2471,6 +2468,7 @@ void PrefsDlg::BuildDialog(){
// label
label = gtk_label_new( _( "minutes" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 );
gtk_widget_show( label );
@ -2503,11 +2501,10 @@ void PrefsDlg::BuildDialog(){
// label
label = gtk_label_new( _( "Prefab path:" ) );
g_object_set( label, "xalign", 0.0, NULL );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// path entry
@ -2531,11 +2528,10 @@ void PrefsDlg::BuildDialog(){
// User ini path
// label
label = gtk_label_new( _( "User INI path:" ) );
g_object_set( label, "xalign", 0.0, NULL );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// user ini path entry
@ -2580,11 +2576,10 @@ void PrefsDlg::BuildDialog(){
// label
label = gtk_label_new( _( "Default texture scale:" ) );
g_object_set( label, "xalign", 0.0, NULL );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
// scale entry
@ -2633,11 +2628,10 @@ void PrefsDlg::BuildDialog(){
gtk_widget_show( table );
label = gtk_label_new( _( "Light radiuses:" ) );
g_object_set( label, "xalign", 0.0, NULL );
gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
combo_list = NULL;
@ -2678,11 +2672,10 @@ void PrefsDlg::BuildDialog(){
// label
label = gtk_label_new( _( "Custom Editor Command" ) );
g_object_set( label, "xalign", 0.0, NULL );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( 0 ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
g_object_set_data( G_OBJECT( dialog ), "label_customeditor", label );
gtk_widget_set_sensitive( label, g_PrefsDlg.m_bUseCustomEditor );
gtk_widget_show( label );

25
radiant/surfacedialog.cpp
View file

@ -528,6 +528,7 @@ void SurfaceDlg::BuildDialog() {
label = gtk_label_new( _( "Texture" ) );
gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, TRUE, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
entry = gtk_entry_new();
@ -544,7 +545,7 @@ void SurfaceDlg::BuildDialog() {
gtk_widget_show( table );
label = gtk_label_new( _( "Horizontal shift" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -561,7 +562,7 @@ void SurfaceDlg::BuildDialog() {
gtk_widget_show( spin );
label = gtk_label_new( _( "Step" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -577,7 +578,7 @@ void SurfaceDlg::BuildDialog() {
gtk_widget_show( entry );
label = gtk_label_new( _( "Vertical shift" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -594,7 +595,7 @@ void SurfaceDlg::BuildDialog() {
gtk_widget_show( spin );
label = gtk_label_new( _( "Step" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 1, 2,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -610,7 +611,7 @@ void SurfaceDlg::BuildDialog() {
gtk_widget_show( entry );
label = gtk_label_new( _( "Horizontal stretch" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -627,7 +628,7 @@ void SurfaceDlg::BuildDialog() {
gtk_widget_show( spin );
label = gtk_label_new( _( "Step" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 2, 3 );
@ -643,7 +644,7 @@ void SurfaceDlg::BuildDialog() {
gtk_widget_show( entry );
label = gtk_label_new( _( "Vertical stretch" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 3, 4,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -660,7 +661,7 @@ void SurfaceDlg::BuildDialog() {
gtk_widget_show( spin );
label = gtk_label_new( _( "Step" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 3, 4,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -676,7 +677,7 @@ void SurfaceDlg::BuildDialog() {
gtk_widget_show( entry );
label = gtk_label_new( _( "Rotate" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 4, 5,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -694,7 +695,7 @@ void SurfaceDlg::BuildDialog() {
gtk_widget_show( spin );
label = gtk_label_new( _( "Step" ) );
gtk_misc_set_alignment( GTK_MISC( label ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 4, 5,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
@ -733,24 +734,28 @@ void SurfaceDlg::BuildDialog() {
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Patch" ) );
gtk_table_attach( GTK_TABLE( table ), label, 0, 1, 2, 3,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Width" ) );
gtk_table_attach( GTK_TABLE( table ), label, 2, 3, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
label = gtk_label_new( _( "Height" ) );
gtk_table_attach( GTK_TABLE( table ), label, 3, 4, 0, 1,
(GtkAttachOptions) ( GTK_FILL ),
(GtkAttachOptions) ( 0 ), 0, 0 );
gtk_misc_set_alignment( GTK_MISC( label ), 0.0, 0.5 );
gtk_widget_show( label );
axial_button = button = gtk_button_new_with_label( _( "Axial" ) );