ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-10 03:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove done, apply button from idtech3 surface inspector.

Browse source 
Turn off the half baked undo, all changes applied immediate for now.
This commit is contained in:
Timothee "TTimo" Besset 2013-09-14 18:45:29 -05:00
parent 1ea5782efb
commit 99e8ea8cf2
1 changed files with 8 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
plugins/surface/surfacedialog.cpp
View file

@ -150,9 +150,6 @@ GtkWidget *fit_height_spinbutton;
GtkWidget *fit_button; GtkWidget *fit_button;
GtkWidget *axial_button; GtkWidget *axial_button;
GtkWidget *done_button;
GtkWidget *apply_button;
// Callbacks // Callbacks
gboolean on_texture_combo_entry_key_press_event( GtkWidget *widget, GdkEventKey *event, gpointer user_data ); gboolean on_texture_combo_entry_key_press_event( GtkWidget *widget, GdkEventKey *event, gpointer user_data );
void on_texture_combo_entry_activate( GtkEntry *entry, gpointer user_data ); void on_texture_combo_entry_activate( GtkEntry *entry, gpointer user_data );
@ -176,10 +173,6 @@ static void on_fit_height_spinbutton_value_changed( GtkSpinButton *spinbutton, g
static void on_fit_button_clicked( GtkButton *button, gpointer user_data ); static void on_fit_button_clicked( GtkButton *button, gpointer user_data );
static void on_axial_button_clicked( GtkButton *button, gpointer user_data ); static void on_axial_button_clicked( GtkButton *button, gpointer user_data );
static void on_done_button_clicked( GtkButton *button, gpointer user_data );
static void on_apply_button_clicked( GtkButton *button, gpointer user_data );
/* /*
=================================================== ===================================================
@ -370,43 +363,15 @@ static void GetTexdefInfo_from_Radiant(){
ZeroOffsetValues(); ZeroOffsetValues();
} }
static gint delete_event_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){ static gint apply_and_hide( GtkWidget *widget, GdkEvent *event, gpointer data ) {
HideDlg();
return TRUE;
}
void DoDone() {
if ( !texdef_face_list_empty() ) {
GetTexMods( TRUE );
}
HideDlg();
Sys_UpdateWindows( W_ALL );
}
void DoApply() {
if ( !g_bListenChanged ) {
return;
}
if ( !texdef_face_list_empty() ) { if ( !texdef_face_list_empty() ) {
GetTexMods( TRUE ); GetTexMods( TRUE );
Sys_UpdateWindows( W_CAMERA ); Sys_UpdateWindows( W_CAMERA );
GetTexdefInfo_from_Radiant(); GetTexdefInfo_from_Radiant();
SetTexMods(); SetTexMods();
} }
} HideDlg();
static gint surface_inspector_key_press_event( GtkWidget *widget, GdkEventKey* event, gpointer data ) {
// NOTE: catching the 'S' key to hide back the surface inspector has been suggested, but would have bad interactions with the texture typing box
// we could do it, but would have to add some focus management and edit logic to that texture name box
// we would also need to expose radiant's g_Commands to identify remapped command keys etc. (or do a first version with hardcoded 'S')
if ( event->keyval == GDK_Escape ) {
CancelDlg();
return TRUE; return TRUE;
} else if ( event->keyval == GDK_Return ) {
DoApply();
return TRUE;
}
return FALSE;
} }
// make the shift increments match the grid settings // make the shift increments match the grid settings
@ -1160,25 +1125,16 @@ GtkWidget* create_SurfaceInspector( void ){
gtk_widget_show( hbuttonbox1 ); gtk_widget_show( hbuttonbox1 );
gtk_box_pack_start( GTK_BOX( vbox7 ), hbuttonbox1, TRUE, FALSE, 0 ); gtk_box_pack_start( GTK_BOX( vbox7 ), hbuttonbox1, TRUE, FALSE, 0 );
apply_button = gtk_button_new_with_label( "Apply" );
gtk_widget_show( apply_button );
gtk_box_pack_end( GTK_BOX( hbuttonbox1 ), apply_button, FALSE, FALSE, 0 );
gtk_widget_set_usize( apply_button, 60, -1 );
done_button = gtk_button_new_with_label( "Done" );
gtk_widget_show( done_button );
gtk_box_pack_end( GTK_BOX( hbuttonbox1 ), done_button, FALSE, FALSE, 0 );
gtk_widget_set_usize( done_button, 60, -1 );
g_signal_connect( (gpointer) SurfaceInspector, g_signal_connect( (gpointer) SurfaceInspector,
"delete_event", "delete_event",
G_CALLBACK( delete_event_callback ), G_CALLBACK( apply_and_hide ),
NULL ); NULL );
g_signal_connect( (gpointer) SurfaceInspector, "destroy", g_signal_connect( (gpointer) SurfaceInspector, "destroy",
G_CALLBACK( gtk_widget_destroy ), G_CALLBACK( gtk_widget_destroy ),
NULL ); NULL );
g_signal_connect( (gpointer) SurfaceInspector, "key_press_event", g_signal_connect( (gpointer) SurfaceInspector, "key_press_event",
G_CALLBACK( surface_inspector_key_press_event ), G_CALLBACK( apply_and_hide ),
NULL ); NULL );
g_signal_connect( (gpointer) texture_combo_entry, "key_press_event", g_signal_connect( (gpointer) texture_combo_entry, "key_press_event",
@ -1238,13 +1194,6 @@ GtkWidget* create_SurfaceInspector( void ){
G_CALLBACK( on_axial_button_clicked ), G_CALLBACK( on_axial_button_clicked ),
NULL ); NULL );
g_signal_connect( (gpointer) done_button, "clicked",
G_CALLBACK( on_done_button_clicked ),
NULL );
g_signal_connect( (gpointer) apply_button, "clicked",
G_CALLBACK( on_apply_button_clicked ),
NULL );
return SurfaceInspector; return SurfaceInspector;
} }
@ -1543,11 +1492,3 @@ static void on_axial_button_clicked( GtkButton *button, gpointer user_data ){
SetTexdef_FaceList( get_texdef_face_list(), FALSE, TRUE ); SetTexdef_FaceList( get_texdef_face_list(), FALSE, TRUE );
Sys_UpdateWindows( W_ALL ); Sys_UpdateWindows( W_ALL );
} }
static void on_done_button_clicked( GtkButton *button, gpointer user_data ) {
DoDone();
}
static void on_apply_button_clicked( GtkButton *button, gpointer user_data ) {
DoApply();
}