X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fentityinspector.cpp;h=0ae57f60ab268882fc9c6113af02f67466a51990;hb=84881a66140ad93d0b6cd4d55efbbb459bd91f48;hp=a82d7797b8c5cc9fa20e48ecf7adf6d766a9165c;hpb=69b4f74e6c95e22d6c6ce10d0e137c875fd83cc4;p=xonotic%2Fnetradiant.git diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp index a82d7797..0ae57f60 100644 --- a/radiant/entityinspector.cpp +++ b/radiant/entityinspector.cpp @@ -142,7 +142,7 @@ void release(){ void apply(){ Scene_EntitySetKeyValue_Selected_Undoable( m_key.c_str(), m_check.active() ? "1" : "0" ); } -typedef MemberCaller ApplyCaller; +typedef MemberCaller ApplyCaller; void update(){ const char* value = SelectedEntity_getValueForKey( m_key.c_str() ); @@ -154,7 +154,7 @@ void update(){ toggle_button_set_active_no_signal( m_check, false ); } } -typedef MemberCaller UpdateCaller; +typedef MemberCaller UpdateCaller; }; @@ -190,14 +190,14 @@ void apply(){ value << m_entry.text(); Scene_EntitySetKeyValue_Selected_Undoable( m_key.c_str(), value.c_str() ); } -typedef MemberCaller ApplyCaller; +typedef MemberCaller ApplyCaller; void update(){ StringOutputStream value( 64 ); value << SelectedEntity_getValueForKey( m_key.c_str() ); m_entry.text(value.c_str()); } -typedef MemberCaller UpdateCaller; +typedef MemberCaller UpdateCaller; }; class ShaderAttribute : public StringAttribute @@ -232,22 +232,22 @@ void apply(){ value << m_entry.m_entry.m_entry.text(); Scene_EntitySetKeyValue_Selected_Undoable( m_key.c_str(), value.c_str() ); } -typedef MemberCaller ApplyCaller; +typedef MemberCaller ApplyCaller; void update(){ StringOutputStream value( 64 ); value << SelectedEntity_getValueForKey( m_key.c_str() ); m_entry.m_entry.m_entry.text(value.c_str()); } -typedef MemberCaller UpdateCaller; +typedef MemberCaller UpdateCaller; void browse( const BrowsedPathEntry::SetPathCallback& setPath ){ - const char *filename = misc_model_dialog( ui::Widget(gtk_widget_get_toplevel( m_entry.m_entry.m_frame ) )); + const char *filename = misc_model_dialog( m_entry.m_entry.m_frame.window() ); if ( filename != 0 ) { setPath( filename ); apply(); } } -typedef MemberCaller1 BrowseCaller; +typedef MemberCaller BrowseCaller; }; const char* browse_sound( ui::Widget parent ){ @@ -295,22 +295,22 @@ void apply(){ value << m_entry.m_entry.m_entry.text(); Scene_EntitySetKeyValue_Selected_Undoable( m_key.c_str(), value.c_str() ); } -typedef MemberCaller ApplyCaller; +typedef MemberCaller ApplyCaller; void update(){ StringOutputStream value( 64 ); value << SelectedEntity_getValueForKey( m_key.c_str() ); m_entry.m_entry.m_entry.text(value.c_str()); } -typedef MemberCaller UpdateCaller; +typedef MemberCaller UpdateCaller; void browse( const BrowsedPathEntry::SetPathCallback& setPath ){ - const char *filename = browse_sound( ui::Widget(gtk_widget_get_toplevel( m_entry.m_entry.m_frame )) ); + const char *filename = browse_sound( m_entry.m_entry.m_frame.window() ); if ( filename != 0 ) { setPath( filename ); apply(); } } -typedef MemberCaller1 BrowseCaller; +typedef MemberCaller BrowseCaller; }; inline double angle_normalised( double angle ){ @@ -342,7 +342,7 @@ void apply(){ angle << angle_normalised( entry_get_float( m_entry ) ); Scene_EntitySetKeyValue_Selected_Undoable( m_key.c_str(), angle.c_str() ); } -typedef MemberCaller ApplyCaller; +typedef MemberCaller ApplyCaller; void update(){ const char* value = SelectedEntity_getValueForKey( m_key.c_str() ); @@ -356,7 +356,7 @@ void update(){ m_entry.text("0"); } } -typedef MemberCaller UpdateCaller; +typedef MemberCaller UpdateCaller; }; namespace @@ -403,7 +403,7 @@ void apply(){ angle << angle_normalised( entry_get_float( m_entry ) ); Scene_EntitySetKeyValue_Selected_Undoable( m_key.c_str(), angle.c_str() ); } -typedef MemberCaller ApplyCaller; +typedef MemberCaller ApplyCaller; void update(){ const char* value = SelectedEntity_getValueForKey( m_key.c_str() ); @@ -433,7 +433,7 @@ void update(){ m_entry.text("0"); } } -typedef MemberCaller UpdateCaller; +typedef MemberCaller UpdateCaller; void applyRadio(){ int index = radio_button_get_active( m_radio.m_radio ); @@ -447,7 +447,7 @@ void applyRadio(){ apply(); } } -typedef MemberCaller ApplyRadioCaller; +typedef MemberCaller ApplyRadioCaller; }; @@ -508,7 +508,7 @@ void apply(){ << " " << angle_normalised( entry_get_float( m_angles.m_roll ) ); Scene_EntitySetKeyValue_Selected_Undoable( m_key.c_str(), angles.c_str() ); } -typedef MemberCaller ApplyCaller; +typedef MemberCaller ApplyCaller; void update(){ StringOutputStream angle( 32 ); @@ -538,7 +538,7 @@ void update(){ m_angles.m_roll.text("0"); } } -typedef MemberCaller UpdateCaller; +typedef MemberCaller UpdateCaller; }; class Vector3Entry @@ -595,7 +595,7 @@ void apply(){ << " " << entry_get_float( m_vector3.m_z ); Scene_EntitySetKeyValue_Selected_Undoable( m_key.c_str(), vector3.c_str() ); } -typedef MemberCaller ApplyCaller; +typedef MemberCaller ApplyCaller; void update(){ StringOutputStream buffer( 32 ); @@ -625,21 +625,21 @@ void update(){ m_vector3.m_z.text("0"); } } -typedef MemberCaller UpdateCaller; +typedef MemberCaller UpdateCaller; }; class NonModalComboBox { -Callback m_changed; +Callback m_changed; guint m_changedHandler; -static gboolean changed( GtkComboBox *widget, NonModalComboBox* self ){ +static gboolean changed( ui::ComboBox widget, NonModalComboBox* self ){ self->m_changed(); return FALSE; } public: -NonModalComboBox( const Callback& changed ) : m_changed( changed ), m_changedHandler( 0 ){ +NonModalComboBox( const Callback& changed ) : m_changed( changed ), m_changedHandler( 0 ){ } void connect( ui::ComboBox combo ){ m_changedHandler = combo.connect( "changed", G_CALLBACK( changed ), this ); @@ -660,7 +660,7 @@ const ListAttributeType& m_type; public: ListAttribute( const char* key, const ListAttributeType& type ) : m_key( key ), - m_combo( 0 ), + m_combo( ui::null ), m_nonModal( ApplyCaller( *this ) ), m_type( type ){ auto combo = ui::ComboBoxText(ui::New); @@ -684,7 +684,7 @@ ui::Widget getWidget() const { void apply(){ Scene_EntitySetKeyValue_Selected_Undoable( m_key.c_str(), m_type[gtk_combo_box_get_active( m_combo )].second.c_str() ); } -typedef MemberCaller ApplyCaller; +typedef MemberCaller ApplyCaller; void update(){ const char* value = SelectedEntity_getValueForKey( m_key.c_str() ); @@ -697,20 +697,22 @@ void update(){ m_nonModal.setActive( m_combo, 0 ); } } -typedef MemberCaller UpdateCaller; +typedef MemberCaller UpdateCaller; }; namespace { +GtkWidget* g_entity_split0 = 0; ui::Widget g_entity_split1{ui::null}; ui::Widget g_entity_split2{ui::null}; +int g_entitysplit0_position; int g_entitysplit1_position; int g_entitysplit2_position; bool g_entityInspector_windowConstructed = false; -GtkTreeView* g_entityClassList; +ui::TreeView g_entityClassList{ui::null}; ui::TextView g_entityClassComment{ui::null}; GtkCheckButton* g_entitySpawnflagsCheck[MAX_FLAGS]; @@ -730,7 +732,7 @@ int g_spawnflag_count; int spawn_table[MAX_FLAGS]; // we change the layout depending on how many spawn flags we need to display // the table is a 4x4 in which we need to put the comment box g_entityClassComment and the spawn flags.. -GtkTable* g_spawnflagsTable; +ui::Table g_spawnflagsTable{ui::null}; ui::VBox g_attributeBox{ui::null}; typedef std::vector EntityAttributes; @@ -840,7 +842,7 @@ void SurfaceFlags_setEntityClass( EntityClass* eclass ){ g_current_flags = eclass; - int spawnflag_count = 0; + unsigned int spawnflag_count = 0; { // do a first pass to count the spawn flags, don't touch the widgets, we don't know in what state they are @@ -858,39 +860,37 @@ void SurfaceFlags_setEntityClass( EntityClass* eclass ){ { for ( int i = 0; i < g_spawnflag_count; ++i ) { - auto widget = ui::CheckButton(g_entitySpawnflagsCheck[i]); - auto label = ui::Label(GTK_LABEL(gtk_bin_get_child(GTK_BIN(widget)))); + auto widget = ui::CheckButton::from(g_entitySpawnflagsCheck[i]); + auto label = ui::Label::from(gtk_bin_get_child(GTK_BIN(widget))); label.text(" "); widget.hide(); widget.ref(); - ui::Container(GTK_CONTAINER(g_spawnflagsTable)).remove(widget); + g_spawnflagsTable.remove(widget); } } g_spawnflag_count = spawnflag_count; { - for ( int i = 0; i < g_spawnflag_count; ++i ) + for (unsigned int i = 0; (int) i < g_spawnflag_count; ++i) { - auto widget = ui::CheckButton(g_entitySpawnflagsCheck[i] ); + auto widget = ui::CheckButton::from(g_entitySpawnflagsCheck[i] ); widget.show(); StringOutputStream str( 16 ); str << LowerCase( eclass->flagnames[spawn_table[i]] ); - 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_spawnflagsTable.attach(widget, {i % 4, i % 4 + 1, i / 4, i / 4 + 1}, {GTK_FILL, GTK_FILL}); widget.unref(); - auto label = ui::Label(GTK_LABEL(gtk_bin_get_child(GTK_BIN(widget)) )); + auto label = ui::Label::from(gtk_bin_get_child(GTK_BIN(widget)) ); label.text(str.c_str()); } } } void EntityClassList_selectEntityClass( EntityClass* eclass ){ - GtkTreeModel* model = GTK_TREE_MODEL( g_entlist_store ); + auto model = g_entlist_store; GtkTreeIter iter; for ( gboolean good = gtk_tree_model_get_iter_first( model, &iter ); good != FALSE; good = gtk_tree_model_iter_next( model, &iter ) ) { @@ -898,7 +898,7 @@ void EntityClassList_selectEntityClass( EntityClass* eclass ){ gtk_tree_model_get( model, &iter, 0, &text, -1 ); if ( strcmp( text, eclass->name() ) == 0 ) { auto view = ui::TreeView(g_entityClassList); - GtkTreePath* path = gtk_tree_model_get_path( model, &iter ); + auto path = gtk_tree_model_get_path( model, &iter ); gtk_tree_selection_select_path( gtk_tree_view_get_selection( view ), path ); if ( gtk_widget_get_realized( view ) ) { gtk_tree_view_scroll_to_cell( view, path, 0, FALSE, 0, 0 ); @@ -989,14 +989,14 @@ void EntityInspector_updateSpawnflags(){ { int v = !!( f & ( 1 << spawn_table[i] ) ); - toggle_button_set_active_no_signal( ui::ToggleButton(GTK_TOGGLE_BUTTON( g_entitySpawnflagsCheck[i] )), v ); + toggle_button_set_active_no_signal( ui::ToggleButton::from( g_entitySpawnflagsCheck[i] ), v ); } } { // take care of the remaining ones for ( int i = g_spawnflag_count; i < MAX_FLAGS; ++i ) { - toggle_button_set_active_no_signal( ui::ToggleButton(GTK_TOGGLE_BUTTON( g_entitySpawnflagsCheck[i] )), FALSE ); + toggle_button_set_active_no_signal( ui::ToggleButton::from( g_entitySpawnflagsCheck[i] ), FALSE ); } } } @@ -1065,7 +1065,7 @@ class EntityInspectorDraw { IdleDraw m_idleDraw; public: -EntityInspectorDraw() : m_idleDraw( FreeCaller( ) ){ +EntityInspectorDraw() : m_idleDraw( makeCallbackF(EntityInspector_updateKeyValues) ){ } void queueDraw(){ m_idleDraw.queueDraw(); @@ -1085,13 +1085,13 @@ void EntityInspector_selectionChanged( const Selectable& ){ // Creates a new entity based on the currently selected brush and entity type. // void EntityClassList_createEntity(){ - GtkTreeView* view = g_entityClassList; + auto view = g_entityClassList; // find out what type of entity we are trying to create GtkTreeModel* model; GtkTreeIter iter; - if ( gtk_tree_selection_get_selected( gtk_tree_view_get_selection( view ), &model, &iter ) == FALSE ) { - ui::Widget(gtk_widget_get_toplevel( ui::TreeView(g_entityClassList) )).alert( "You must have a selected class to create an entity", "info" ); + if ( gtk_tree_selection_get_selected( gtk_tree_view_get_selection( g_entityClassList ), &model, &iter ) == FALSE ) { + ui::alert( view.window(), "You must have a selected class to create an entity", "info" ); return; } @@ -1119,14 +1119,14 @@ void EntityInspector_applyKeyValue(){ // TTimo: if you change the classname to worldspawn you won't merge back in the structural brushes but create a parasite entity if ( !strcmp( key.c_str(), "classname" ) && !strcmp( value.c_str(), "worldspawn" ) ) { - ui::Widget(gtk_widget_get_toplevel( g_entityKeyEntry ) ).alert( "Cannot change \"classname\" key back to worldspawn.", 0, ui::alert_type::OK ); + ui::alert( g_entityKeyEntry.window(), "Cannot change \"classname\" key back to worldspawn.", 0, ui::alert_type::OK ); return; } // RR2DO2: we don't want spaces in entity keys if ( strstr( key.c_str(), " " ) ) { - ui::Widget(gtk_widget_get_toplevel( g_entityKeyEntry ) ).alert( "No spaces are allowed in entity keys.", 0, ui::alert_type::OK ); + ui::alert( g_entityKeyEntry.window(), "No spaces are allowed in entity keys.", 0, ui::alert_type::OK ); return; } @@ -1155,6 +1155,23 @@ void EntityInspector_clearKeyValue(){ } } +static gint EntityInspector_clearKeyValueKB( GtkEntry* widget, GdkEventKey* event, gpointer data ){ + if ( event->keyval == GDK_Delete ) { + // Get current selection text + StringOutputStream key( 64 ); + key << gtk_entry_get_text( g_entityKeyEntry ); + + if ( strcmp( key.c_str(), "classname" ) != 0 ) { + StringOutputStream command; + command << "entityDeleteKey -key " << key.c_str(); + UndoableCommand undo( command.c_str() ); + Scene_EntitySetKeyValue_Selected( key.c_str(), "" ); + } + return TRUE; + } + return FALSE; +} + void EntityInspector_clearAllKeyValues(){ UndoableCommand undo( "entityClear" ); @@ -1170,7 +1187,7 @@ void EntityInspector_clearAllKeyValues(){ // ============================================================================= // callbacks -static void EntityClassList_selection_changed( GtkTreeSelection* selection, gpointer data ){ +static void EntityClassList_selection_changed( ui::TreeSelection selection, gpointer data ){ GtkTreeModel* model; GtkTreeIter selected; if ( gtk_tree_selection_get_selected( selection, &model, &selected ) ) { @@ -1214,7 +1231,7 @@ static gint EntityClassList_keypress( ui::Widget widget, GdkEventKey* event, gpo gtk_tree_model_get( model, &iter, 0, &text, -1 ); if ( toupper( text[0] ) == (int)code ) { - GtkTreePath* path = gtk_tree_model_get_path( model, &iter ); + auto path = gtk_tree_model_get_path( model, &iter ); gtk_tree_selection_select_path( gtk_tree_view_get_selection( view ), path ); if ( gtk_widget_get_realized( view ) ) { gtk_tree_view_scroll_to_cell( view, path, 0, FALSE, 0, 0 ); @@ -1235,7 +1252,7 @@ static gint EntityClassList_keypress( ui::Widget widget, GdkEventKey* event, gpo return FALSE; } -static void EntityProperties_selection_changed( GtkTreeSelection* selection, gpointer data ){ +static void EntityProperties_selection_changed( ui::TreeSelection selection, gpointer data ){ // find out what type of entity we are trying to create GtkTreeModel* model; GtkTreeIter iter; @@ -1262,7 +1279,7 @@ static gint EntityEntry_keypress( ui::Entry widget, GdkEventKey* event, gpointer if ( event->keyval == GDK_KEY_Return ) { if ( widget._handle == g_entityKeyEntry._handle ) { g_entityValueEntry.text( "" ); - gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( widget ) ), g_entityValueEntry ); + gtk_window_set_focus( widget.window(), g_entityValueEntry ); } else { @@ -1270,8 +1287,18 @@ static gint EntityEntry_keypress( ui::Entry widget, GdkEventKey* event, gpointer } return TRUE; } - if ( event->keyval == GDK_KEY_Escape ) { - gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( widget ) ), NULL ); + if ( event->keyval == GDK_Tab ) { + if ( widget._handle == g_entityKeyEntry._handle ) { + gtk_window_set_focus( widget.window(), g_entityValueEntry ); + } + else + { + gtk_window_set_focus( widget.window(), g_entityKeyEntry ); + } + return TRUE; + } + if ( event->keyval == GDK_Escape ) { + // gtk_window_set_focus( widget.window(), NULL ); return TRUE; } @@ -1279,18 +1306,33 @@ static gint EntityEntry_keypress( ui::Entry widget, GdkEventKey* event, gpointer } void EntityInspector_destroyWindow( ui::Widget widget, gpointer data ){ + g_entitysplit0_position = gtk_paned_get_position( GTK_PANED( g_entity_split0 ) ); g_entitysplit1_position = gtk_paned_get_position( GTK_PANED( g_entity_split1 ) ); g_entitysplit2_position = gtk_paned_get_position( GTK_PANED( g_entity_split2 ) ); - g_entityInspector_windowConstructed = false; GlobalEntityAttributes_clear(); } +static gint EntityInspector_hideWindowKB( GtkWidget* widget, GdkEventKey* event, gpointer data ){ + //if ( event->keyval == GDK_Escape && GTK_WIDGET_VISIBLE( GTK_WIDGET( widget ) ) ) { + if ( event->keyval == GDK_Escape ) { + //GroupDialog_showPage( g_page_entity ); + gtk_widget_hide( GTK_WIDGET( GroupDialog_getWindow() ) ); + return TRUE; + } + if ( event->keyval == GDK_Tab ) { + gtk_window_set_focus( GTK_WINDOW( gtk_widget_get_toplevel( GTK_WIDGET( widget ) ) ), GTK_WIDGET( g_entityKeyEntry ) ); + return TRUE; + } + return FALSE; +} + ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ auto vbox = ui::VBox( FALSE, 2 ); vbox.show(); gtk_container_set_border_width( GTK_CONTAINER( vbox ), 2 ); + g_signal_connect( G_OBJECT( toplevel ), "key_press_event", G_CALLBACK( EntityInspector_hideWindowKB ), 0 ); vbox.connect( "destroy", G_CALLBACK( EntityInspector_destroyWindow ), 0 ); { @@ -1302,7 +1344,8 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ { ui::Widget split2 = ui::VPaned(ui::New); - gtk_paned_add1( GTK_PANED( split1 ), split2 ); + //gtk_paned_add1( GTK_PANED( split1 ), split2 ); + gtk_paned_pack1( GTK_PANED( split1 ), split2, FALSE, FALSE ); split2.show(); g_entity_split2 = split2; @@ -1311,27 +1354,28 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ // class list auto scr = ui::ScrolledWindow(ui::New); scr.show(); - gtk_paned_add1( GTK_PANED( split2 ), scr ); + //gtk_paned_add1( GTK_PANED( split2 ), scr ); + gtk_paned_pack1( GTK_PANED( split2 ), scr, FALSE, FALSE ); 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 ); { - ui::ListStore store = ui::ListStore(gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_POINTER )); + ui::ListStore store = ui::ListStore::from(gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_POINTER )); - auto view = ui::TreeView( ui::TreeModel( GTK_TREE_MODEL( store ) )); - gtk_tree_view_set_enable_search( GTK_TREE_VIEW( view ), FALSE ); + auto view = ui::TreeView( ui::TreeModel::from( store._handle )); + gtk_tree_view_set_enable_search(view, FALSE ); gtk_tree_view_set_headers_visible( view, FALSE ); 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(ui::New); - GtkTreeViewColumn* column = ui::TreeViewColumn( "Key", renderer, {{"text", 0}} ); + auto column = ui::TreeViewColumn( "Key", renderer, {{"text", 0}} ); gtk_tree_view_append_column( view, column ); } { - auto selection = ui::TreeSelection(gtk_tree_view_get_selection( view )); + auto selection = ui::TreeSelection::from(gtk_tree_view_get_selection( view )); selection.connect( "changed", G_CALLBACK( EntityClassList_selection_changed ), 0 ); } @@ -1348,13 +1392,14 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ { auto scr = ui::ScrolledWindow(ui::New); scr.show(); - gtk_paned_add2( GTK_PANED( split2 ), scr ); + //gtk_paned_add2( GTK_PANED( split2 ), scr ); + gtk_paned_pack2( GTK_PANED( split2 ), scr, FALSE, FALSE ); 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 ); { auto text = ui::TextView(ui::New); - gtk_widget_set_size_request( text , 0, -1 ); // allow shrinking + text.dimensions(0, -1); // allow shrinking gtk_text_view_set_wrap_mode( text, GTK_WRAP_WORD ); gtk_text_view_set_editable( text, FALSE ); text.show(); @@ -1365,14 +1410,16 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ } { - ui::Widget split2 = ui::VPaned(ui::New); - gtk_paned_add2( GTK_PANED( split1 ), split2 ); - split2.show(); + ui::Widget split0 = ui::VPaned(ui::New); + //gtk_paned_add2( GTK_PANED( split1 ), split0 ); + gtk_paned_pack2( GTK_PANED( split1 ), split0, FALSE, FALSE ); + split0.show(); + g_entity_split0 = split0; { auto vbox2 = ui::VBox( FALSE, 2 ); vbox2.show(); - gtk_paned_pack1( GTK_PANED( split2 ), vbox2, FALSE, FALSE ); + gtk_paned_pack1( GTK_PANED( split0 ), vbox2, FALSE, FALSE ); { // Spawnflags (4 colums wide max, or window gets too wide.) @@ -1400,26 +1447,27 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN ); { - ui::ListStore store = ui::ListStore(gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_STRING )); + ui::ListStore store = ui::ListStore::from(gtk_list_store_new( 2, G_TYPE_STRING, G_TYPE_STRING )); - ui::Widget 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( GTK_TREE_VIEW( view ), FALSE ); + auto view = ui::TreeView(ui::TreeModel::from(store._handle)); + gtk_tree_view_set_enable_search(view, FALSE ); + gtk_tree_view_set_headers_visible(view, FALSE ); + g_signal_connect( G_OBJECT( view ), "key_press_event", G_CALLBACK( EntityInspector_clearKeyValueKB ), 0 ); { auto renderer = ui::CellRendererText(ui::New); - GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", 0}} ); - gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column ); + auto column = ui::TreeViewColumn( "", renderer, {{"text", 0}} ); + gtk_tree_view_append_column(view, column ); } { auto renderer = ui::CellRendererText(ui::New); - GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", 1}} ); - gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column ); + auto column = ui::TreeViewColumn( "", renderer, {{"text", 1}} ); + gtk_tree_view_append_column(view, column ); } { - auto selection = ui::TreeSelection(gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) )); + auto selection = ui::TreeSelection::from(gtk_tree_view_get_selection(view)); selection.connect( "changed", G_CALLBACK( EntityProperties_selection_changed ), 0 ); } @@ -1444,9 +1492,7 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ { auto entry = ui::Entry(ui::New); entry.show(); - gtk_table_attach( table, entry , 1, 2, 0, 1, - (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), - (GtkAttachOptions)( 0 ), 0, 0 ); + table.attach(entry, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0}); gtk_widget_set_events( entry , GDK_KEY_PRESS_MASK ); entry.connect( "key_press_event", G_CALLBACK( EntityEntry_keypress ), 0 ); g_entityKeyEntry = entry; @@ -1455,9 +1501,7 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ { auto entry = ui::Entry(ui::New); entry.show(); - gtk_table_attach( table, entry , 1, 2, 1, 2, - (GtkAttachOptions)( GTK_EXPAND | GTK_FILL ), - (GtkAttachOptions)( 0 ), 0, 0 ); + table.attach(entry, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0}); gtk_widget_set_events( entry , GDK_KEY_PRESS_MASK ); entry.connect( "key_press_event", G_CALLBACK( EntityEntry_keypress ), 0 ); g_entityValueEntry = entry; @@ -1466,18 +1510,14 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ { auto label = ui::Label( "Value" ); label.show(); - gtk_table_attach( table, label , 0, 1, 1, 2, - (GtkAttachOptions)( GTK_FILL ), - (GtkAttachOptions)( 0 ), 0, 0 ); + table.attach(label, {0, 1, 1, 2}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); } { auto label = ui::Label( "Key" ); label.show(); - gtk_table_attach( table, label , 0, 1, 0, 1, - (GtkAttachOptions)( GTK_FILL ), - (GtkAttachOptions)( 0 ), 0, 0 ); + table.attach(label, {0, 1, 0, 1}, {GTK_FILL, 0}); gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 ); } } @@ -1507,7 +1547,7 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ scr.show(); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scr ), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC ); - auto viewport = ui::Container(GTK_CONTAINER(gtk_viewport_new( 0, 0 ))); + auto viewport = ui::Container::from(gtk_viewport_new( 0, 0 )); viewport.show(); gtk_viewport_set_shadow_type( GTK_VIEWPORT( viewport ), GTK_SHADOW_NONE ); @@ -1516,33 +1556,29 @@ ui::Widget EntityInspector_constructWindow( ui::Window toplevel ){ viewport.add(g_attributeBox); scr.add(viewport); - gtk_paned_pack2( GTK_PANED( split2 ), scr, FALSE, FALSE ); + gtk_paned_pack2( GTK_PANED( split0 ), scr, FALSE, FALSE ); } } } { - // show the sliders in any case - if ( g_entitysplit2_position > 22 ) { - gtk_paned_set_position( GTK_PANED( g_entity_split2 ), g_entitysplit2_position ); - } - else { + // show the sliders in any case //no need, gtk can care + /*if ( g_entitysplit2_position < 22 ) { g_entitysplit2_position = 22; - gtk_paned_set_position( GTK_PANED( g_entity_split2 ), 22 ); - } - if ( ( g_entitysplit1_position - g_entitysplit2_position ) > 27 ) { - gtk_paned_set_position( GTK_PANED( g_entity_split1 ), g_entitysplit1_position ); - } - else { - gtk_paned_set_position( GTK_PANED( g_entity_split1 ), g_entitysplit2_position + 27 ); - } + }*/ + gtk_paned_set_position( GTK_PANED( g_entity_split2 ), g_entitysplit2_position ); + /*if ( ( g_entitysplit1_position - g_entitysplit2_position ) < 27 ) { + g_entitysplit1_position = g_entitysplit2_position + 27; + }*/ + gtk_paned_set_position( GTK_PANED( g_entity_split1 ), g_entitysplit1_position ); + gtk_paned_set_position( GTK_PANED( g_entity_split0 ), g_entitysplit0_position ); } g_entityInspector_windowConstructed = true; EntityClassList_fill(); - typedef FreeCaller1 EntityInspectorSelectionChangedCaller; + typedef FreeCaller EntityInspectorSelectionChangedCaller; GlobalSelectionSystem().addSelectionChangeCallback( EntityInspectorSelectionChangedCaller() ); GlobalEntityCreator().setKeyValueChangedFunc( EntityInspector_keyValueChanged ); @@ -1584,8 +1620,9 @@ EntityInspector g_EntityInspector; void EntityInspector_construct(){ GlobalEntityClassManager().attach( g_EntityInspector ); - GlobalPreferenceSystem().registerPreference( "EntitySplit1", IntImportStringCaller( g_entitysplit1_position ), IntExportStringCaller( g_entitysplit1_position ) ); - GlobalPreferenceSystem().registerPreference( "EntitySplit2", IntImportStringCaller( g_entitysplit2_position ), IntExportStringCaller( g_entitysplit2_position ) ); + GlobalPreferenceSystem().registerPreference( "EntitySplit0", make_property_string( g_entitysplit0_position ) ); + GlobalPreferenceSystem().registerPreference( "EntitySplit1", make_property_string( g_entitysplit1_position ) ); + GlobalPreferenceSystem().registerPreference( "EntitySplit2", make_property_string( g_entitysplit2_position ) ); }