#include "entityinspector.h"
#include "debugging/debugging.h"
+#include <gtk/gtk.h>
#include "ientity.h"
#include "ifilesystem.h"
m_check = check;
- guint handler = g_signal_connect( G_OBJECT( check ), "toggled", G_CALLBACK( toggled ), this );
+ guint handler = check.connect( "toggled", G_CALLBACK( toggled ), this );
g_object_set_data( G_OBJECT( check ), "handler", gint_to_pointer( handler ) );
update();
public:
StringAttribute( const char* key ) :
m_key( key ),
- m_entry( nullptr ),
+ m_entry( ui::null ),
m_nonModal( ApplyCaller( *this ), UpdateCaller( *this ) ){
auto entry = ui::Entry();
entry.show();
public:
AngleAttribute( const char* key ) :
m_key( key ),
- m_entry( nullptr ),
+ m_entry( ui::null ),
m_nonModal( ApplyCaller( *this ), UpdateCaller( *this ) ){
auto entry = numeric_entry_new();
m_entry = entry;
NonModalEntry m_nonModal;
RadioHBox m_radio;
NonModalRadio m_nonModalRadio;
-ui::HBox m_hbox{nullptr};
+ui::HBox m_hbox{ui::null};
public:
DirectionAttribute( const char* key ) :
m_key( key ),
- m_entry( nullptr ),
+ m_entry( ui::null ),
m_nonModal( ApplyCaller( *this ), UpdateCaller( *this ) ),
m_radio( RadioHBox_new( STRING_ARRAY_RANGE( buttons ) ) ),
m_nonModalRadio( ApplyRadioCaller( *this ) ){
ui::Entry m_roll;
ui::Entry m_pitch;
ui::Entry m_yaw;
-AnglesEntry() : m_roll( nullptr ), m_pitch( nullptr ), m_yaw( nullptr ){
+AnglesEntry() : m_roll( ui::null ), m_pitch( ui::null ), m_yaw( ui::null ){
}
};
ui::Entry m_x;
ui::Entry m_y;
ui::Entry m_z;
-Vector3Entry() : m_x( nullptr ), m_y( nullptr ), m_z( nullptr ){
+Vector3Entry() : m_x( ui::null ), m_y( ui::null ), m_z( ui::null ){
}
};
CopiedString m_key;
Vector3Entry m_vector3;
NonModalEntry m_nonModal;
-ui::Box m_hbox{nullptr};
+ui::Box m_hbox{ui::null};
public:
Vector3Attribute( const char* key ) :
m_key( key ),
public:
NonModalComboBox( const Callback& changed ) : m_changed( changed ), m_changedHandler( 0 ){
}
-void connect( GtkComboBox* combo ){
- m_changedHandler = g_signal_connect( G_OBJECT( combo ), "changed", G_CALLBACK( changed ), this );
+void connect( ui::ComboBox combo ){
+ m_changedHandler = combo.connect( "changed", G_CALLBACK( changed ), this );
}
-void setActive( GtkComboBox* combo, int value ){
+void setActive( ui::ComboBox combo, int value ){
g_signal_handler_disconnect( G_OBJECT( combo ), m_changedHandler );
gtk_combo_box_set_active( combo, value );
connect( combo );
class ListAttribute : public EntityAttribute
{
CopiedString m_key;
-GtkComboBox* m_combo;
+ui::ComboBox m_combo;
NonModalComboBox m_nonModal;
const ListAttributeType& m_type;
public:
GtkEntry* g_entityKeyEntry;
GtkEntry* g_entityValueEntry;
-ui::ListStore g_entlist_store{nullptr};
-ui::ListStore g_entprops_store{nullptr};
+ui::ListStore g_entlist_store{ui::null};
+ui::ListStore g_entprops_store{ui::null};
const EntityClass* g_current_flags = 0;
const EntityClass* g_current_comment = 0;
const EntityClass* g_current_attributes = 0;
// the table is a 4x4 in which we need to put the comment box g_entityClassComment and the spawn flags..
GtkTable* g_spawnflagsTable;
-ui::VBox g_attributeBox{nullptr};
+ui::VBox g_attributeBox{ui::null};
typedef std::vector<EntityAttribute*> EntityAttributes;
EntityAttributes g_entityAttributes;
}
gtk_table_attach( g_spawnflagsTable, widget, i % 4, i % 4 + 1, i / 4, i / 4 + 1,
(GtkAttachOptions)( GTK_FILL ),
(GtkAttachOptions)( GTK_FILL ), 0, 0 );
- g_object_unref( widget );
+ widget.unref();
gtk_label_set_text( GTK_LABEL( gtk_bin_get_child(GTK_BIN(widget)) ), str.c_str() );
}
static gint EntityClassList_keypress( ui::Widget widget, GdkEventKey* event, gpointer data ){
unsigned int code = gdk_keyval_to_upper( event->keyval );
- if ( event->keyval == GDK_Return ) {
+ if ( event->keyval == GDK_KEY_Return ) {
EntityClassList_createEntity();
return TRUE;
}
}
static gint EntityEntry_keypress( GtkEntry* widget, GdkEventKey* event, gpointer data ){
- if ( event->keyval == GDK_Return ) {
+ if ( event->keyval == GDK_KEY_Return ) {
if ( widget == g_entityKeyEntry ) {
gtk_entry_set_text( g_entityValueEntry, "" );
gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( widget ) ) ), GTK_WIDGET( g_entityValueEntry ) );
}
return TRUE;
}
- if ( event->keyval == GDK_Escape ) {
+ if ( event->keyval == GDK_KEY_Escape ) {
gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( widget ) ) ), NULL );
return TRUE;
}
vbox.show();
gtk_container_set_border_width( GTK_CONTAINER( vbox ), 2 );
- g_signal_connect( G_OBJECT( vbox ), "destroy", G_CALLBACK( EntityInspector_destroyWindow ), 0 );
+ vbox.connect( "destroy", G_CALLBACK( EntityInspector_destroyWindow ), 0 );
{
ui::Widget split1 = ui::VPaned();
auto view = ui::TreeView( ui::TreeModel( GTK_TREE_MODEL( store ) ));
gtk_tree_view_set_enable_search( GTK_TREE_VIEW( view ), FALSE );
gtk_tree_view_set_headers_visible( view, FALSE );
- g_signal_connect( G_OBJECT( view ), "button_press_event", G_CALLBACK( EntityClassList_button_press ), 0 );
- g_signal_connect( G_OBJECT( view ), "key_press_event", G_CALLBACK( EntityClassList_keypress ), 0 );
+ view.connect( "button_press_event", G_CALLBACK( EntityClassList_button_press ), 0 );
+ view.connect( "key_press_event", G_CALLBACK( EntityClassList_keypress ), 0 );
{
auto renderer = ui::CellRendererText();
}
{
- GtkTreeSelection* selection = gtk_tree_view_get_selection( view );
- g_signal_connect( G_OBJECT( selection ), "changed", G_CALLBACK( EntityClassList_selection_changed ), 0 );
+ auto selection = ui::TreeSelection(gtk_tree_view_get_selection( view ));
+ selection.connect( "changed", G_CALLBACK( EntityClassList_selection_changed ), 0 );
}
view.show();
scr.add(view);
- g_object_unref( G_OBJECT( store ) );
+ store.unref();
g_entityClassList = view;
g_entlist_store = store;
}
for ( int i = 0; i < MAX_FLAGS; i++ )
{
- GtkCheckButton* check = ui::CheckButton( "" );
+ auto check = ui::CheckButton( "" );
g_object_ref( GTK_WIDGET( check ) );
- g_object_set_data( G_OBJECT( check ), "handler", gint_to_pointer( g_signal_connect( G_OBJECT( check ), "toggled", G_CALLBACK( SpawnflagCheck_toggled ), 0 ) ) );
+ g_object_set_data( G_OBJECT( check ), "handler", gint_to_pointer( check.connect( "toggled", G_CALLBACK( SpawnflagCheck_toggled ), 0 ) ) );
g_entitySpawnflagsCheck[i] = check;
}
}
}
{
- GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) );
- g_signal_connect( G_OBJECT( selection ), "changed", G_CALLBACK( EntityProperties_selection_changed ), 0 );
+ auto selection = ui::TreeSelection(gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) ));
+ selection.connect( "changed", G_CALLBACK( EntityProperties_selection_changed ), 0 );
}
view.show();
scr.add(view);
- g_object_unref( G_OBJECT( store ) );
+ store.unref();
g_entprops_store = store;
}
(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_events( GTK_WIDGET( entry ), GDK_KEY_PRESS_MASK );
- g_signal_connect( G_OBJECT( entry ), "key_press_event", G_CALLBACK( EntityEntry_keypress ), 0 );
+ entry.connect( "key_press_event", G_CALLBACK( EntityEntry_keypress ), 0 );
g_entityKeyEntry = entry;
}
(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),
(GtkAttachOptions)( 0 ), 0, 0 );
gtk_widget_set_events( GTK_WIDGET( entry ), GDK_KEY_PRESS_MASK );
- g_signal_connect( G_OBJECT( entry ), "key_press_event", G_CALLBACK( EntityEntry_keypress ), 0 );
+ entry.connect( "key_press_event", G_CALLBACK( EntityEntry_keypress ), 0 );
g_entityValueEntry = entry;
}
{
auto button = ui::Button( "Clear All" );
button.show();
- g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( EntityInspector_clearAllKeyValues ), 0 );
+ button.connect( "clicked", G_CALLBACK( EntityInspector_clearAllKeyValues ), 0 );
gtk_box_pack_start( hbox, GTK_WIDGET( button ), TRUE, TRUE, 0 );
}
{
auto button = ui::Button( "Delete Key" );
button.show();
- g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( EntityInspector_clearKeyValue ), 0 );
+ button.connect( "clicked", G_CALLBACK( EntityInspector_clearKeyValue ), 0 );
gtk_box_pack_start( hbox, GTK_WIDGET( button ), TRUE, TRUE, 0 );
}
}
projects / xonotic / netradiant.git / blobdiff