X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Ftexwindow.cpp;h=a86575bff925ed257672d70c8d88058f07c0c97b;hp=7d1782eca9c9e1ebb1dd4460f5574442f218e2c0;hb=2a1cfc426e60b77c7b212d827e2592de01041266;hpb=1ce2d1a4685918788e3f22c8f26f652e474da6c0 diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 7d1782ec..a86575bf 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -111,7 +111,7 @@ void TextureGroups_addWad( TextureGroups& groups, const char* archive ){ #endif } } -typedef ReferenceCaller1 TextureGroupsAddWadCaller; +typedef ReferenceCaller TextureGroupsAddWadCaller; namespace { @@ -167,12 +167,12 @@ void TextureGroups_addShader( TextureGroups& groups, const char* shaderName ){ } } } -typedef ReferenceCaller1 TextureGroupsAddShaderCaller; +typedef ReferenceCaller TextureGroupsAddShaderCaller; void TextureGroups_addDirectory( TextureGroups& groups, const char* directory ){ groups.insert( directory ); } -typedef ReferenceCaller1 TextureGroupsAddDirectoryCaller; +typedef ReferenceCaller TextureGroupsAddDirectoryCaller; class DeferredAdjustment { @@ -215,7 +215,7 @@ static void adjustment_value_changed( GtkAdjustment *adjustment, DeferredAdjustm class TextureBrowser; -typedef ReferenceCaller TextureBrowserQueueDrawCaller; +typedef ReferenceCaller TextureBrowserQueueDrawCaller; void TextureBrowser_scrollChanged( void* data, gdouble value ); @@ -226,26 +226,26 @@ enum StartupShaders STARTUPSHADERS_COMMON, }; -void TextureBrowser_hideUnusedExport( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserHideUnusedExport; +void TextureBrowser_hideUnusedExport( const ImportExportCallback::Import_t& importer ); +typedef FreeCaller::Import_t&), TextureBrowser_hideUnusedExport> TextureBrowserHideUnusedExport; -void TextureBrowser_showShadersExport( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserShowShadersExport; +void TextureBrowser_showShadersExport( const ImportExportCallback::Import_t& importer ); +typedef FreeCaller::Import_t&), TextureBrowser_showShadersExport> TextureBrowserShowShadersExport; -void TextureBrowser_showShaderlistOnly( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserShowShaderlistOnlyExport; +void TextureBrowser_showShaderlistOnly( const ImportExportCallback::Import_t& importer ); +typedef FreeCaller::Import_t&), TextureBrowser_showShaderlistOnly> TextureBrowserShowShaderlistOnlyExport; -void TextureBrowser_fixedSize( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserFixedSizeExport; +void TextureBrowser_fixedSize( const ImportExportCallback::Import_t& importer ); +typedef FreeCaller::Import_t&), TextureBrowser_fixedSize> TextureBrowserFixedSizeExport; -void TextureBrowser_filterMissing( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserFilterMissingExport; +void TextureBrowser_filterMissing( const ImportExportCallback::Import_t& importer ); +typedef FreeCaller::Import_t&), TextureBrowser_filterMissing> TextureBrowserFilterMissingExport; -void TextureBrowser_filterFallback( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserFilterFallbackExport; +void TextureBrowser_filterFallback( const ImportExportCallback::Import_t& importer ); +typedef FreeCaller::Import_t&), TextureBrowser_filterFallback> TextureBrowserFilterFallbackExport; -void TextureBrowser_enableAlpha( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserEnableAlphaExport; +void TextureBrowser_enableAlpha( const ImportExportCallback::Import_t& importer ); +typedef FreeCaller::Import_t&), TextureBrowser_enableAlpha> TextureBrowserEnableAlphaExport; class TextureBrowser { @@ -258,19 +258,19 @@ CopiedString shader; ui::Window m_parent{ui::null}; ui::GLArea m_gl_widget{ui::null}; -ui::Widget m_texture_scroll; -ui::Widget m_treeViewTree; -ui::Widget m_treeViewTags; +ui::Widget m_texture_scroll{ui::null}; +ui::TreeView m_treeViewTree{ui::null}; +ui::TreeView m_treeViewTags{ui::null}; ui::Frame m_tag_frame{ui::null}; ui::ListStore m_assigned_store{ui::null}; ui::ListStore m_available_store{ui::null}; -ui::Widget m_assigned_tree; -ui::Widget m_available_tree; -ui::Widget m_scr_win_tree; -ui::Widget m_scr_win_tags; -ui::Widget m_tag_notebook; +ui::TreeView m_assigned_tree{ui::null}; +ui::TreeView m_available_tree{ui::null}; +ui::Widget m_scr_win_tree{ui::null}; +ui::Widget m_scr_win_tags{ui::null}; +ui::Widget m_tag_notebook{ui::null}; ui::Button m_search_button{ui::null}; -ui::Widget m_shader_info_item; +ui::Widget m_shader_info_item{ui::null}; std::set m_all_tags; ui::ListStore m_all_tags_list{ui::null}; @@ -349,11 +349,11 @@ int getTextureHeight( qtexture_t* tex ){ TextureBrowser() : m_texture_scroll( 0 ), m_hideunused_item( TextureBrowserHideUnusedExport() ), + m_hidenotex_item( TextureBrowserFilterFallbackExport() ), m_showshaders_item( TextureBrowserShowShadersExport() ), m_showshaderlistonly_item( TextureBrowserShowShaderlistOnlyExport() ), m_fixedsize_item( TextureBrowserFixedSizeExport() ), m_filternotex_item( TextureBrowserFilterMissingExport() ), - m_hidenotex_item( TextureBrowserFilterFallbackExport() ), m_enablealpha_item( TextureBrowserEnableAlphaExport() ), m_heightChanged( true ), m_originInvalid( true ), @@ -674,11 +674,11 @@ void TextureBrowser_activeShadersChanged( TextureBrowser& textureBrowser ){ void TextureBrowser_importShowScrollbar( TextureBrowser& textureBrowser, bool value ){ textureBrowser.m_showTextureScrollbar = value; if ( textureBrowser.m_texture_scroll != 0 ) { - widget_set_visible( textureBrowser.m_texture_scroll, textureBrowser.m_showTextureScrollbar ); + textureBrowser.m_texture_scroll.visible(textureBrowser.m_showTextureScrollbar); TextureBrowser_updateScroll( textureBrowser ); } } -typedef ReferenceCaller1 TextureBrowserImportShowScrollbarCaller; +typedef ReferenceCaller TextureBrowserImportShowScrollbarCaller; /* @@ -738,7 +738,7 @@ void visit( const char* name ){ void TextureBrowser_SetHideUnused( TextureBrowser& textureBrowser, bool hideUnused ); -ui::Widget g_page_textures; +ui::Widget g_page_textures{ui::null}; void TextureBrowser_toggleShow(){ GroupDialog_showPage( g_page_textures ); @@ -756,7 +756,7 @@ class TextureCategoryLoadShader const char* m_directory; std::size_t& m_count; public: -typedef const char* first_argument_type; +using func = void(const char *); TextureCategoryLoadShader( const char* directory, std::size_t& count ) : m_directory( directory ), m_count( count ){ @@ -791,7 +791,7 @@ void TextureDirectory_loadTexture( const char* directory, const char* texture ){ IShader* shader = QERApp_Shader_ForName( name.c_str() ); shader->DecRef(); } -typedef ConstPointerCaller1 TextureDirectoryLoadTextureCaller; +typedef ConstPointerCaller TextureDirectoryLoadTextureCaller; class LoadTexturesByTypeVisitor : public ImageModules::Visitor { @@ -818,7 +818,7 @@ void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* d TextureBrowser_heightChanged( textureBrowser ); std::size_t shaders_count; - GlobalShaderSystem().foreachShaderName( makeCallback1( TextureCategoryLoadShader( directory, shaders_count ) ) ); + GlobalShaderSystem().foreachShaderName(makeCallback( TextureCategoryLoadShader( directory, shaders_count ) ) ); globalOutputStream() << "Showing " << Unsigned( shaders_count ) << " shaders.\n"; if ( g_pGameDescription->mGameType != "doom3" ) { @@ -842,7 +842,7 @@ void TextureBrowser_ShowTagSearchResult( TextureBrowser& textureBrowser, const c TextureBrowser_heightChanged( textureBrowser ); std::size_t shaders_count; - GlobalShaderSystem().foreachShaderName( makeCallback1( TextureCategoryLoadShader( directory, shaders_count ) ) ); + GlobalShaderSystem().foreachShaderName(makeCallback( TextureCategoryLoadShader( directory, shaders_count ) ) ); globalOutputStream() << "Showing " << Unsigned( shaders_count ) << " shaders.\n"; if ( g_pGameDescription->mGameType != "doom3" ) { @@ -863,40 +863,40 @@ void TextureBrowser_ShowTagSearchResult( TextureBrowser& textureBrowser, const c bool TextureBrowser_hideUnused(); -void TextureBrowser_hideUnusedExport( const BoolImportCallback& importer ){ +void TextureBrowser_hideUnusedExport( const ImportExportCallback::Import_t& importer ){ importer( TextureBrowser_hideUnused() ); } -typedef FreeCaller1 TextureBrowserHideUnusedExport; +typedef FreeCaller::Import_t&), TextureBrowser_hideUnusedExport> TextureBrowserHideUnusedExport; -void TextureBrowser_showShadersExport( const BoolImportCallback& importer ){ +void TextureBrowser_showShadersExport( const ImportExportCallback::Import_t& importer ){ importer( GlobalTextureBrowser().m_showShaders ); } -typedef FreeCaller1 TextureBrowserShowShadersExport; +typedef FreeCaller::Import_t&), TextureBrowser_showShadersExport> TextureBrowserShowShadersExport; -void TextureBrowser_showShaderlistOnly( const BoolImportCallback& importer ){ +void TextureBrowser_showShaderlistOnly( const ImportExportCallback::Import_t& importer ){ importer( g_TextureBrowser_shaderlistOnly ); } -typedef FreeCaller1 TextureBrowserShowShaderlistOnlyExport; +typedef FreeCaller::Import_t&), TextureBrowser_showShaderlistOnly> TextureBrowserShowShaderlistOnlyExport; -void TextureBrowser_fixedSize( const BoolImportCallback& importer ){ +void TextureBrowser_fixedSize( const ImportExportCallback::Import_t& importer ){ importer( g_TextureBrowser_fixedSize ); } -typedef FreeCaller1 TextureBrowser_FixedSizeExport; +typedef FreeCaller::Import_t&), TextureBrowser_fixedSize> TextureBrowser_FixedSizeExport; -void TextureBrowser_filterMissing( const BoolImportCallback& importer ){ +void TextureBrowser_filterMissing( const ImportExportCallback::Import_t& importer ){ importer( g_TextureBrowser_filterMissing ); } -typedef FreeCaller1 TextureBrowser_filterMissingExport; +typedef FreeCaller::Import_t&), TextureBrowser_filterMissing> TextureBrowser_filterMissingExport; -void TextureBrowser_filterFallback( const BoolImportCallback& importer ){ +void TextureBrowser_filterFallback( const ImportExportCallback::Import_t& importer ){ importer( g_TextureBrowser_filterFallback ); } -typedef FreeCaller1 TextureBrowser_filterFallbackExport; +typedef FreeCaller::Import_t&), TextureBrowser_filterFallback> TextureBrowser_filterFallbackExport; -void TextureBrowser_enableAlpha( const BoolImportCallback& importer ){ +void TextureBrowser_enableAlpha( const ImportExportCallback::Import_t& importer ){ importer( g_TextureBrowser_enableAlpha ); } -typedef FreeCaller1 TextureBrowser_enableAlphaExport; +typedef FreeCaller::Import_t&), TextureBrowser_enableAlpha> TextureBrowser_enableAlphaExport; void TextureBrowser_SetHideUnused( TextureBrowser& textureBrowser, bool hideUnused ){ if ( hideUnused ) { @@ -1299,15 +1299,14 @@ enum void BuildStoreAssignedTags( ui::ListStore store, const char* shader, TextureBrowser* textureBrowser ){ GtkTreeIter iter; - gtk_list_store_clear( store ); + store.clear(); std::vector assigned_tags; TagBuilder.GetShaderTags( shader, assigned_tags ); for ( size_t i = 0; i < assigned_tags.size(); i++ ) { - gtk_list_store_append( store, &iter ); - gtk_list_store_set( store, &iter, TAG_COLUMN, assigned_tags[i].c_str(), -1 ); + store.append(TAG_COLUMN, assigned_tags[i].c_str()); } } @@ -1320,35 +1319,33 @@ void BuildStoreAvailableTags( ui::ListStore storeAvailable, std::set::const_iterator iterAll; gchar* tag_assigned; - gtk_list_store_clear( storeAvailable ); + storeAvailable.clear(); - bool row = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( storeAssigned ), &iterAssigned ) != 0; + bool row = gtk_tree_model_get_iter_first(storeAssigned, &iterAssigned ) != 0; if ( !row ) { // does the shader have tags assigned? for ( iterAll = allTags.begin(); iterAll != allTags.end(); ++iterAll ) { - gtk_list_store_append( storeAvailable, &iterAvailable ); - gtk_list_store_set( storeAvailable, &iterAvailable, TAG_COLUMN, ( *iterAll ).c_str(), -1 ); + storeAvailable.append(TAG_COLUMN, (*iterAll).c_str()); } } else { while ( row ) // available tags = all tags - assigned tags { - gtk_tree_model_get( GTK_TREE_MODEL( storeAssigned ), &iterAssigned, TAG_COLUMN, &tag_assigned, -1 ); + gtk_tree_model_get(storeAssigned, &iterAssigned, TAG_COLUMN, &tag_assigned, -1 ); for ( iterAll = allTags.begin(); iterAll != allTags.end(); ++iterAll ) { if ( strcmp( (char*)tag_assigned, ( *iterAll ).c_str() ) != 0 ) { - gtk_list_store_append( storeAvailable, &iterAvailable ); - gtk_list_store_set( storeAvailable, &iterAvailable, TAG_COLUMN, ( *iterAll ).c_str(), -1 ); + storeAvailable.append(TAG_COLUMN, (*iterAll).c_str()); } else { - row = gtk_tree_model_iter_next( GTK_TREE_MODEL( storeAssigned ), &iterAssigned ) != 0; + row = gtk_tree_model_iter_next(storeAssigned, &iterAssigned ) != 0; if ( row ) { - gtk_tree_model_get( GTK_TREE_MODEL( storeAssigned ), &iterAssigned, TAG_COLUMN, &tag_assigned, -1 ); + gtk_tree_model_get(storeAssigned, &iterAssigned, TAG_COLUMN, &tag_assigned, -1 ); } } } @@ -1382,7 +1379,7 @@ gboolean TextureBrowser_button_press( ui::Widget widget, GdkEventButton* event, if ( GlobalTextureBrowser().m_tags ) { textureBrowser->m_rmbSelected = false; - gtk_widget_hide( textureBrowser->m_tag_frame ); + textureBrowser->m_tag_frame.hide(); } } } @@ -1429,7 +1426,7 @@ void TextureBrowser_updateScroll( TextureBrowser& textureBrowser ){ totalHeight = std::max( totalHeight, textureBrowser.height ); - GtkAdjustment *vadjustment = gtk_range_get_adjustment( GTK_RANGE( textureBrowser.m_texture_scroll ) ); + auto vadjustment = gtk_range_get_adjustment( GTK_RANGE( textureBrowser.m_texture_scroll ) ); gtk_adjustment_set_value(vadjustment, -TextureBrowser_getOriginY( textureBrowser )); gtk_adjustment_set_page_size(vadjustment, textureBrowser.height); @@ -1483,7 +1480,7 @@ void TextureBrowser_ToggleHideUnused(){ } } -void TextureGroups_constructTreeModel( TextureGroups groups, GtkTreeStore* store ){ +void TextureGroups_constructTreeModel( TextureGroups groups, ui::TreeStore store ){ // put the information from the old textures menu into a treeview GtkTreeIter iter, child; @@ -1540,31 +1537,28 @@ TextureGroups TextureGroups_constructTreeView(){ void TextureBrowser_constructTreeStore(){ TextureGroups groups = TextureGroups_constructTreeView(); - GtkTreeStore* store = gtk_tree_store_new( 1, G_TYPE_STRING ); + auto store = ui::TreeStore(gtk_tree_store_new( 1, G_TYPE_STRING )); TextureGroups_constructTreeModel( groups, store ); - std::set::iterator iter; - - GtkTreeModel* model = GTK_TREE_MODEL( store ); - gtk_tree_view_set_model( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), model ); + gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTree, store); g_object_unref( G_OBJECT( store ) ); } void TextureBrowser_constructTreeStoreTags(){ TextureGroups groups; - GtkTreeStore* store = gtk_tree_store_new( 1, G_TYPE_STRING ); - GtkTreeModel* model = GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ); + auto store = ui::TreeStore(gtk_tree_store_new( 1, G_TYPE_STRING )); + auto model = g_TextureBrowser.m_all_tags_list; - gtk_tree_view_set_model( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), model ); + gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTags, model ); g_object_unref( G_OBJECT( store ) ); } -void TreeView_onRowActivated( GtkTreeView* treeview, GtkTreePath* path, GtkTreeViewColumn* col, gpointer userdata ){ +void TreeView_onRowActivated( ui::TreeView treeview, GtkTreePath* path, ui::TreeViewColumn col, gpointer userdata ){ GtkTreeIter iter; - GtkTreeModel* model = gtk_tree_view_get_model( GTK_TREE_VIEW( treeview ) ); + auto model = gtk_tree_view_get_model(treeview ); if ( gtk_tree_model_get_iter( model, &iter, path ) ) { gchar dirName[1024]; @@ -1587,14 +1581,14 @@ void TreeView_onRowActivated( GtkTreeView* treeview, GtkTreePath* path, GtkTreeV } void TextureBrowser_createTreeViewTree(){ - g_TextureBrowser.m_treeViewTree = ui::TreeView(); - gtk_tree_view_set_enable_search( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), FALSE ); + g_TextureBrowser.m_treeViewTree = ui::TreeView(ui::New); + gtk_tree_view_set_enable_search(g_TextureBrowser.m_treeViewTree, FALSE ); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), FALSE ); + gtk_tree_view_set_headers_visible(g_TextureBrowser.m_treeViewTree, FALSE ); g_TextureBrowser.m_treeViewTree.connect( "row-activated", (GCallback) TreeView_onRowActivated, NULL ); - auto renderer = ui::CellRendererText(); - gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), -1, "", renderer, "text", 0, NULL ); + auto renderer = ui::CellRendererText(ui::New); + gtk_tree_view_insert_column_with_attributes(g_TextureBrowser.m_treeViewTree, -1, "", renderer, "text", 0, NULL ); TextureBrowser_constructTreeStore(); } @@ -1604,7 +1598,7 @@ void TextureBrowser_renameTag(); void TextureBrowser_deleteTag(); void TextureBrowser_createContextMenu( ui::Widget treeview, GdkEventButton *event ){ - ui::Widget menu = ui::Menu(); + ui::Widget menu = ui::Menu(ui::New); ui::Widget menuitem = ui::MenuItem( "Add tag" ); menuitem.connect( "activate", (GCallback)TextureBrowser_addTag, treeview ); @@ -1625,12 +1619,12 @@ void TextureBrowser_createContextMenu( ui::Widget treeview, GdkEventButton *even gdk_event_get_time( (GdkEvent*)event ) ); } -gboolean TreeViewTags_onButtonPressed( ui::Widget treeview, GdkEventButton *event ){ +gboolean TreeViewTags_onButtonPressed( ui::TreeView treeview, GdkEventButton *event ){ if ( event->type == GDK_BUTTON_PRESS && event->button == 3 ) { GtkTreePath *path; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( treeview ) ); + auto selection = gtk_tree_view_get_selection(treeview ); - if ( gtk_tree_view_get_path_at_pos( GTK_TREE_VIEW( treeview ), event->x, event->y, &path, NULL, NULL, NULL ) ) { + if ( gtk_tree_view_get_path_at_pos(treeview, event->x, event->y, &path, NULL, NULL, NULL ) ) { gtk_tree_selection_unselect_all( selection ); gtk_tree_selection_select_path( selection, path ); gtk_tree_path_free( path ); @@ -1643,15 +1637,15 @@ gboolean TreeViewTags_onButtonPressed( ui::Widget treeview, GdkEventButton *even } void TextureBrowser_createTreeViewTags(){ - g_TextureBrowser.m_treeViewTags = ui::TreeView(); - gtk_tree_view_set_enable_search( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), FALSE ); + g_TextureBrowser.m_treeViewTags = ui::TreeView(ui::New); + gtk_tree_view_set_enable_search(g_TextureBrowser.m_treeViewTags, FALSE ); g_TextureBrowser.m_treeViewTags.connect( "button-press-event", (GCallback)TreeViewTags_onButtonPressed, NULL ); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), FALSE ); + gtk_tree_view_set_headers_visible(g_TextureBrowser.m_treeViewTags, FALSE ); - auto renderer = ui::CellRendererText(); - gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), -1, "", renderer, "text", 0, NULL ); + auto renderer = ui::CellRendererText(ui::New); + gtk_tree_view_insert_column_with_attributes(g_TextureBrowser.m_treeViewTags, -1, "", renderer, "text", 0, NULL ); TextureBrowser_constructTreeStoreTags(); } @@ -1697,7 +1691,7 @@ ui::MenuItem TextureBrowser_constructViewMenu( ui::Menu menu ){ if ( string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ) ) { menu_separator( menu ); - g_TextureBrowser.m_shader_info_item = ui::Widget(GTK_WIDGET( create_menu_item_with_mnemonic( menu, "Shader Info", "ShaderInfo" ) )); + g_TextureBrowser.m_shader_info_item = ui::Widget(create_menu_item_with_mnemonic( menu, "Shader Info", "ShaderInfo" )); gtk_widget_set_sensitive( g_TextureBrowser.m_shader_info_item, FALSE ); } @@ -1735,10 +1729,10 @@ ui::MenuItem TextureBrowser_constructTagsMenu( ui::Menu menu ){ return textures_menu_item; } -gboolean TextureBrowser_tagMoveHelper( GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, GSList** selected ){ +gboolean TextureBrowser_tagMoveHelper( ui::TreeModel model, ui::TreePath path, GtkTreeIter* iter, GSList** selected ){ g_assert( selected != NULL ); - GtkTreeRowReference* rowref = gtk_tree_row_reference_new( model, path ); + auto rowref = gtk_tree_row_reference_new( model, path ); *selected = g_slist_append( *selected, rowref ); return FALSE; @@ -1749,20 +1743,20 @@ void TextureBrowser_assignTags(){ GSList* node; gchar* tag_assigned; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_available_tree ); gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); if ( selected != NULL ) { for ( node = selected; node != NULL; node = node->next ) { - GtkTreePath* path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); + auto path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); if ( path ) { GtkTreeIter iter; - if ( gtk_tree_model_get_iter( GTK_TREE_MODEL( g_TextureBrowser.m_available_store ), &iter, path ) ) { - gtk_tree_model_get( GTK_TREE_MODEL( g_TextureBrowser.m_available_store ), &iter, TAG_COLUMN, &tag_assigned, -1 ); + if ( gtk_tree_model_get_iter(g_TextureBrowser.m_available_store, &iter, path ) ) { + gtk_tree_model_get(g_TextureBrowser.m_available_store, &iter, TAG_COLUMN, &tag_assigned, -1 ); if ( !TagBuilder.CheckShaderTag( g_TextureBrowser.shader.c_str() ) ) { // create a custom shader/texture entry IShader* ishader = QERApp_Shader_ForName( g_TextureBrowser.shader.c_str() ); @@ -1781,8 +1775,7 @@ void TextureBrowser_assignTags(){ TagBuilder.AddShaderTag( g_TextureBrowser.shader.c_str(), (char*)tag_assigned, TAG ); gtk_list_store_remove( g_TextureBrowser.m_available_store, &iter ); - gtk_list_store_append( g_TextureBrowser.m_assigned_store, &iter ); - gtk_list_store_set( g_TextureBrowser.m_assigned_store, &iter, TAG_COLUMN, (char*)tag_assigned, -1 ); + g_TextureBrowser.m_assigned_store.append(TAG_COLUMN, tag_assigned); } } } @@ -1800,20 +1793,20 @@ void TextureBrowser_removeTags(){ GSList* node; gchar* tag; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_assigned_tree ); gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); if ( selected != NULL ) { for ( node = selected; node != NULL; node = node->next ) { - GtkTreePath* path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); + auto path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); if ( path ) { GtkTreeIter iter; - if ( gtk_tree_model_get_iter( GTK_TREE_MODEL( g_TextureBrowser.m_assigned_store ), &iter, path ) ) { - gtk_tree_model_get( GTK_TREE_MODEL( g_TextureBrowser.m_assigned_store ), &iter, TAG_COLUMN, &tag, -1 ); + if ( gtk_tree_model_get_iter(g_TextureBrowser.m_assigned_store, &iter, path ) ) { + gtk_tree_model_get(g_TextureBrowser.m_assigned_store, &iter, TAG_COLUMN, &tag, -1 ); TagBuilder.DeleteShaderTag( g_TextureBrowser.shader.c_str(), tag ); gtk_list_store_remove( g_TextureBrowser.m_assigned_store, &iter ); } @@ -1832,15 +1825,13 @@ void TextureBrowser_removeTags(){ } void TextureBrowser_buildTagList(){ - GtkTreeIter treeIter; - gtk_list_store_clear( g_TextureBrowser.m_all_tags_list ); + g_TextureBrowser.m_all_tags_list.clear(); std::set::iterator iter; for ( iter = g_TextureBrowser.m_all_tags.begin(); iter != g_TextureBrowser.m_all_tags.end(); ++iter ) { - gtk_list_store_append( g_TextureBrowser.m_all_tags_list, &treeIter ); - gtk_list_store_set( g_TextureBrowser.m_all_tags_list, &treeIter, TAG_COLUMN, ( *iter ).c_str(), -1 ); + g_TextureBrowser.m_all_tags_list.append(TAG_COLUMN, (*iter).c_str()); } } @@ -1851,7 +1842,7 @@ void TextureBrowser_searchTags(){ char buffer[256]; char tags_searched[256]; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); @@ -1861,13 +1852,13 @@ void TextureBrowser_searchTags(){ for ( node = selected; node != NULL; node = node->next ) { - GtkTreePath* path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); + auto path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); if ( path ) { GtkTreeIter iter; - if ( gtk_tree_model_get_iter( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iter, path ) ) { - gtk_tree_model_get( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iter, TAG_COLUMN, &tag, -1 ); + if ( gtk_tree_model_get_iter(g_TextureBrowser.m_all_tags_list, &iter, path ) ) { + gtk_tree_model_get(g_TextureBrowser.m_all_tags_list, &iter, TAG_COLUMN, &tag, -1 ); strcat( buffer, tag ); strcat( tags_searched, tag ); @@ -1921,7 +1912,7 @@ void TextureBrowser_toggleSearchButton(){ gtk_widget_show_all( g_TextureBrowser.m_search_button ); } else { - gtk_widget_hide( g_TextureBrowser.m_search_button ); + g_TextureBrowser.m_search_button.hide(); } } @@ -1940,7 +1931,7 @@ void TextureBrowser_constructTagNotebook(){ void TextureBrowser_constructSearchButton(){ ui::Widget image = ui::Widget(gtk_image_new_from_stock( GTK_STOCK_FIND, GTK_ICON_SIZE_SMALL_TOOLBAR )); - g_TextureBrowser.m_search_button = ui::Button(); + g_TextureBrowser.m_search_button = ui::Button(ui::New); g_TextureBrowser.m_search_button.connect( "clicked", G_CALLBACK( TextureBrowser_searchTags ), NULL ); gtk_widget_set_tooltip_text(g_TextureBrowser.m_search_button, "Search with selected tags"); g_TextureBrowser.m_search_button.add(image); @@ -1989,7 +1980,7 @@ void TextureBrowser_SetNotex(){ name << GlobalRadiant().getAppPath() << "bitmaps/" NOTEX_BASENAME ".png"; g_notex = name.c_str(); - name = NULL; + name = StringOutputStream(256); name << GlobalRadiant().getAppPath() << "bitmaps/" SHADERNOTEX_BASENAME " .png"; g_shadernotex = name.c_str(); } @@ -2003,35 +1994,34 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ TextureBrowser_checkTagFile(); TextureBrowser_SetNotex(); - GlobalShaderSystem().setActiveShadersChangedNotify( ReferenceCaller( g_TextureBrowser ) ); + GlobalShaderSystem().setActiveShadersChangedNotify( ReferenceCaller( g_TextureBrowser ) ); g_TextureBrowser.m_parent = toplevel; - ui::Widget table = ui::Table( 3, 3, FALSE ); - ui::Widget frame_table; - ui::Widget vbox = ui::VBox( FALSE, 0 ); - gtk_table_attach( GTK_TABLE( table ), vbox, 0, 1, 1, 3, GTK_FILL, GTK_FILL, 0, 0 ); + auto table = ui::Table(3, 3, FALSE); + auto vbox = ui::VBox(FALSE, 0); + table.attach(vbox, {0, 1, 1, 3}, {GTK_FILL, GTK_FILL}); vbox.show(); - ui::Widget menu_bar; + ui::Widget menu_bar{ui::null}; { // menu bar menu_bar = ui::Widget(gtk_menu_bar_new()); - auto menu_view = ui::Menu(); + auto menu_view = ui::Menu(ui::New); auto view_item = TextureBrowser_constructViewMenu( menu_view ); gtk_menu_item_set_submenu( GTK_MENU_ITEM( view_item ), menu_view ); gtk_menu_shell_append( GTK_MENU_SHELL( menu_bar ), view_item ); - auto menu_tools = ui::Menu(); + auto menu_tools = ui::Menu(ui::New); auto tools_item = TextureBrowser_constructToolsMenu( menu_tools ); gtk_menu_item_set_submenu( GTK_MENU_ITEM( tools_item ), menu_tools ); gtk_menu_shell_append( GTK_MENU_SHELL( menu_bar ), tools_item ); - gtk_table_attach( GTK_TABLE( table ), menu_bar, 0, 3, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0 ); + table.attach(menu_bar, {0, 3, 0, 1}, {GTK_FILL, GTK_SHRINK}); menu_bar.show(); } { // Texture TreeView - g_TextureBrowser.m_scr_win_tree = ui::ScrolledWindow(); + g_TextureBrowser.m_scr_win_tree = ui::ScrolledWindow(ui::New); gtk_container_set_border_width( GTK_CONTAINER( g_TextureBrowser.m_scr_win_tree ), 0 ); // vertical only scrolling for treeview @@ -2041,19 +2031,19 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ TextureBrowser_createTreeViewTree(); - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tree ), GTK_WIDGET( g_TextureBrowser.m_treeViewTree ) ); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tree ), g_TextureBrowser.m_treeViewTree ); g_TextureBrowser.m_treeViewTree.show(); } { // gl_widget scrollbar ui::Widget w = ui::Widget(gtk_vscrollbar_new( ui::Adjustment( 0,0,0,1,1,0 ) )); - gtk_table_attach( GTK_TABLE( table ), w, 2, 3, 1, 2, GTK_SHRINK, GTK_FILL, 0, 0 ); + table.attach(w, {2, 3, 1, 2}, {GTK_SHRINK, GTK_FILL}); w.show(); g_TextureBrowser.m_texture_scroll = w; auto vadjustment = ui::Adjustment(gtk_range_get_adjustment( GTK_RANGE( g_TextureBrowser.m_texture_scroll ) )); vadjustment.connect( "value_changed", G_CALLBACK( TextureBrowser_verticalScroll ), &g_TextureBrowser ); - widget_set_visible( g_TextureBrowser.m_texture_scroll, g_TextureBrowser.m_showTextureScrollbar ); + g_TextureBrowser.m_texture_scroll.visible(g_TextureBrowser.m_showTextureScrollbar); } { // gl_widget g_TextureBrowser.m_gl_widget = glwidget_new( FALSE ); @@ -2062,7 +2052,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ gtk_widget_set_events( g_TextureBrowser.m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); gtk_widget_set_can_focus( g_TextureBrowser.m_gl_widget, true ); - gtk_table_attach_defaults( GTK_TABLE( table ), g_TextureBrowser.m_gl_widget, 1, 2, 1, 2 ); + table.attach(g_TextureBrowser.m_gl_widget, {1, 2, 1, 2}); g_TextureBrowser.m_gl_widget.show(); g_TextureBrowser.m_sizeHandler = g_TextureBrowser.m_gl_widget.connect( "size_allocate", G_CALLBACK( TextureBrowser_size_allocate ), &g_TextureBrowser ); @@ -2078,20 +2068,20 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ if ( g_TextureBrowser.m_tags ) { { // fill tag GtkListStore g_TextureBrowser.m_all_tags_list = ui::ListStore(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); - GtkTreeSortable* sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_all_tags_list ); + auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_all_tags_list ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); TagBuilder.GetAllTags( g_TextureBrowser.m_all_tags ); TextureBrowser_buildTagList(); } { // tag menu bar - auto menu_tags = ui::Menu(); + auto menu_tags = ui::Menu(ui::New); auto tags_item = TextureBrowser_constructTagsMenu( menu_tags ); gtk_menu_item_set_submenu( GTK_MENU_ITEM( tags_item ), menu_tags ); gtk_menu_shell_append( GTK_MENU_SHELL( menu_bar ), tags_item ); } { // Tag TreeView - g_TextureBrowser.m_scr_win_tags = ui::ScrolledWindow(); + g_TextureBrowser.m_scr_win_tags = ui::ScrolledWindow(ui::New); gtk_container_set_border_width( GTK_CONTAINER( g_TextureBrowser.m_scr_win_tags ), 0 ); // vertical only scrolling for treeview @@ -2099,104 +2089,104 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ TextureBrowser_createTreeViewTags(); - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tags ), GTK_WIDGET( g_TextureBrowser.m_treeViewTags ) ); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tags ), g_TextureBrowser.m_treeViewTags ); g_TextureBrowser.m_treeViewTags.show(); } { // Texture/Tag notebook TextureBrowser_constructTagNotebook(); - gtk_box_pack_start( GTK_BOX( vbox ), g_TextureBrowser.m_tag_notebook, TRUE, TRUE, 0 ); + vbox.pack_start( g_TextureBrowser.m_tag_notebook, TRUE, TRUE, 0 ); } { // Tag search button TextureBrowser_constructSearchButton(); - gtk_box_pack_end( GTK_BOX( vbox ), g_TextureBrowser.m_search_button, FALSE, FALSE, 0 ); + vbox.pack_end(g_TextureBrowser.m_search_button, FALSE, FALSE, 0); } + auto frame_table = ui::Table(3, 3, FALSE); { // Tag frame - frame_table = ui::Table( 3, 3, FALSE ); g_TextureBrowser.m_tag_frame = ui::Frame( "Tag assignment" ); gtk_frame_set_label_align( GTK_FRAME( g_TextureBrowser.m_tag_frame ), 0.5, 0.5 ); gtk_frame_set_shadow_type( GTK_FRAME( g_TextureBrowser.m_tag_frame ), GTK_SHADOW_NONE ); - gtk_table_attach( GTK_TABLE( table ), g_TextureBrowser.m_tag_frame, 1, 3, 2, 3, GTK_FILL, GTK_SHRINK, 0, 0 ); + table.attach(g_TextureBrowser.m_tag_frame, {1, 3, 2, 3}, {GTK_FILL, GTK_SHRINK}); frame_table.show(); g_TextureBrowser.m_tag_frame.add(frame_table); } { // assigned tag list - ui::Widget scrolled_win = ui::ScrolledWindow(); + ui::Widget scrolled_win = ui::ScrolledWindow(ui::New); gtk_container_set_border_width( GTK_CONTAINER( scrolled_win ), 0 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); g_TextureBrowser.m_assigned_store = ui::ListStore(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); - GtkTreeSortable* sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_assigned_store ); + auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_assigned_store ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); - auto renderer = ui::CellRendererText(); + auto renderer = ui::CellRendererText(ui::New); - g_TextureBrowser.m_assigned_tree = ui::TreeView(ui::TreeModel( GTK_TREE_MODEL( g_TextureBrowser.m_assigned_store ) )); + g_TextureBrowser.m_assigned_tree = ui::TreeView(ui::TreeModel(g_TextureBrowser.m_assigned_store )); g_TextureBrowser.m_assigned_store.unref(); g_TextureBrowser.m_assigned_tree.connect( "row-activated", (GCallback) TextureBrowser_removeTags, NULL ); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ), FALSE ); + gtk_tree_view_set_headers_visible(g_TextureBrowser.m_assigned_tree, FALSE ); - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_assigned_tree ); gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); - GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", TAG_COLUMN}} ); - gtk_tree_view_append_column( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ), column ); + auto column = ui::TreeViewColumn( "", renderer, {{"text", TAG_COLUMN}} ); + gtk_tree_view_append_column(g_TextureBrowser.m_assigned_tree, column ); g_TextureBrowser.m_assigned_tree.show(); scrolled_win.show(); - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_WIDGET( g_TextureBrowser.m_assigned_tree ) ); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), g_TextureBrowser.m_assigned_tree ); - gtk_table_attach( GTK_TABLE( frame_table ), scrolled_win, 0, 1, 1, 3, GTK_FILL, GTK_FILL, 0, 0 ); + frame_table.attach(scrolled_win, {0, 1, 1, 3}, {GTK_FILL, GTK_FILL}); } { // available tag list - ui::Widget scrolled_win = ui::ScrolledWindow(); + ui::Widget scrolled_win = ui::ScrolledWindow(ui::New); gtk_container_set_border_width( GTK_CONTAINER( scrolled_win ), 0 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); g_TextureBrowser.m_available_store = ui::ListStore(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); - GtkTreeSortable* sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_available_store ); + auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_available_store ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); - auto renderer = ui::CellRendererText(); + auto renderer = ui::CellRendererText(ui::New); - g_TextureBrowser.m_available_tree = ui::TreeView(ui::TreeModel( GTK_TREE_MODEL( g_TextureBrowser.m_available_store ) )); + g_TextureBrowser.m_available_tree = ui::TreeView(ui::TreeModel(g_TextureBrowser.m_available_store )); g_TextureBrowser.m_available_store.unref(); g_TextureBrowser.m_available_tree.connect( "row-activated", (GCallback) TextureBrowser_assignTags, NULL ); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ), FALSE ); + gtk_tree_view_set_headers_visible(g_TextureBrowser.m_available_tree, FALSE ); - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_available_tree ); gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); - GtkTreeViewColumn* column = ui::TreeViewColumn( "", renderer, {{"text", TAG_COLUMN}} ); - gtk_tree_view_append_column( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ), column ); + auto column = ui::TreeViewColumn( "", renderer, {{"text", TAG_COLUMN}} ); + gtk_tree_view_append_column(g_TextureBrowser.m_available_tree, column ); g_TextureBrowser.m_available_tree.show(); scrolled_win.show(); - gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_WIDGET( g_TextureBrowser.m_available_tree ) ); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), g_TextureBrowser.m_available_tree ); - gtk_table_attach( GTK_TABLE( frame_table ), scrolled_win, 2, 3, 1, 3, GTK_FILL, GTK_FILL, 0, 0 ); + frame_table.attach(scrolled_win, {2, 3, 1, 3}, {GTK_FILL, GTK_FILL}); } { // tag arrow buttons - auto m_btn_left = ui::Button(); - auto m_btn_right = ui::Button(); + auto m_btn_left = ui::Button(ui::New); + auto m_btn_right = ui::Button(ui::New); auto m_arrow_left = ui::Widget(gtk_arrow_new( GTK_ARROW_LEFT, GTK_SHADOW_OUT )); auto m_arrow_right = ui::Widget(gtk_arrow_new( GTK_ARROW_RIGHT, GTK_SHADOW_OUT )); m_btn_left.add(m_arrow_left); m_btn_right.add(m_arrow_right); // workaround. the size of the tag frame depends of the requested size of the arrow buttons. - gtk_widget_set_size_request( m_arrow_left, -1, 68 ); - gtk_widget_set_size_request( m_arrow_right, -1, 68 ); + m_arrow_left.dimensions(-1, 68); + m_arrow_right.dimensions(-1, 68); - gtk_table_attach( GTK_TABLE( frame_table ), m_btn_left, 1, 2, 1, 2, GTK_SHRINK, GTK_EXPAND, 0, 0 ); - gtk_table_attach( GTK_TABLE( frame_table ), m_btn_right, 1, 2, 2, 3, GTK_SHRINK, GTK_EXPAND, 0, 0 ); + frame_table.attach(m_btn_left, {1, 2, 1, 2}, {GTK_SHRINK, GTK_EXPAND}); + frame_table.attach(m_btn_right, {1, 2, 2, 3}, {GTK_SHRINK, GTK_EXPAND}); m_btn_left.connect( "clicked", G_CALLBACK( TextureBrowser_assignTags ), NULL ); m_btn_right.connect( "clicked", G_CALLBACK( TextureBrowser_removeTags ), NULL ); @@ -2210,15 +2200,15 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ ui::Widget m_lbl_assigned = ui::Label( "Assigned" ); ui::Widget m_lbl_unassigned = ui::Label( "Available" ); - gtk_table_attach( GTK_TABLE( frame_table ), m_lbl_assigned, 0, 1, 0, 1, GTK_EXPAND, GTK_SHRINK, 0, 0 ); - gtk_table_attach( GTK_TABLE( frame_table ), m_lbl_unassigned, 2, 3, 0, 1, GTK_EXPAND, GTK_SHRINK, 0, 0 ); + frame_table.attach(m_lbl_assigned, {0, 1, 0, 1}, {GTK_EXPAND, GTK_SHRINK}); + frame_table.attach(m_lbl_unassigned, {2, 3, 0, 1}, {GTK_EXPAND, GTK_SHRINK}); m_lbl_assigned.show(); m_lbl_unassigned.show(); } } else { // no tag support, show the texture tree only - gtk_box_pack_start( GTK_BOX( vbox ), g_TextureBrowser.m_scr_win_tree, TRUE, TRUE, 0 ); + vbox.pack_start( g_TextureBrowser.m_scr_win_tree, TRUE, TRUE, 0 ); } // TODO do we need this? @@ -2228,7 +2218,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ } void TextureBrowser_destroyWindow(){ - GlobalShaderSystem().setActiveShadersChangedNotify( Callback() ); + GlobalShaderSystem().setActiveShadersChangedNotify( Callback() ); g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_sizeHandler ); g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_exposeHandler ); @@ -2245,7 +2235,7 @@ void TextureBrowser_setBackgroundColour( TextureBrowser& textureBrowser, const V TextureBrowser_queueDraw( textureBrowser ); } -void TextureBrowser_selectionHelper( GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, GSList** selected ){ +void TextureBrowser_selectionHelper( ui::TreeModel model, ui::TreePath path, GtkTreeIter* iter, GSList** selected ){ g_assert( selected != NULL ); gchar* name; @@ -2268,17 +2258,16 @@ void TextureBrowser_addTag(){ EMessageBoxReturn result = DoShaderTagDlg( &tag, "Add shader tag" ); if ( result == eIDOK && !tag.empty() ) { - GtkTreeIter iter, iter2; + GtkTreeIter iter; g_TextureBrowser.m_all_tags.insert( tag.c_str() ); gtk_list_store_append( g_TextureBrowser.m_available_store, &iter ); gtk_list_store_set( g_TextureBrowser.m_available_store, &iter, TAG_COLUMN, tag.c_str(), -1 ); // Select the currently added tag in the available list - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_available_tree ); gtk_tree_selection_select_iter( selection, &iter ); - gtk_list_store_append( g_TextureBrowser.m_all_tags_list, &iter2 ); - gtk_list_store_set( g_TextureBrowser.m_all_tags_list, &iter2, TAG_COLUMN, tag.c_str(), -1 ); + g_TextureBrowser.m_all_tags_list.append(TAG_COLUMN, tag.c_str()); } } @@ -2292,7 +2281,7 @@ void TextureBrowser_renameTag(){ GSList* selected = NULL; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); gtk_tree_selection_selected_foreach( selection, GtkTreeSelectionForeachFunc( TextureBrowser_selectionHelper ), &selected ); if ( g_slist_length( selected ) == 1 ) { // we only rename a single tag @@ -2304,16 +2293,16 @@ void TextureBrowser_renameTag(){ gchar* rowTag; gchar* oldTag = (char*)selected->data; - bool row = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterList ) != 0; + bool row = gtk_tree_model_get_iter_first(g_TextureBrowser.m_all_tags_list, &iterList ) != 0; while ( row ) { - gtk_tree_model_get( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterList, TAG_COLUMN, &rowTag, -1 ); + gtk_tree_model_get(g_TextureBrowser.m_all_tags_list, &iterList, TAG_COLUMN, &rowTag, -1 ); if ( strcmp( rowTag, oldTag ) == 0 ) { gtk_list_store_set( g_TextureBrowser.m_all_tags_list, &iterList, TAG_COLUMN, newTag.c_str(), -1 ); } - row = gtk_tree_model_iter_next( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterList ) != 0; + row = gtk_tree_model_iter_next(g_TextureBrowser.m_all_tags_list, &iterList ) != 0; } TagBuilder.RenameShaderTag( oldTag, newTag.c_str() ); @@ -2327,18 +2316,18 @@ void TextureBrowser_renameTag(){ } else { - ui::Widget(GTK_WIDGET( g_TextureBrowser.m_parent )).alert( "Select a single tag for renaming." ); + g_TextureBrowser.m_parent.alert( "Select a single tag for renaming." ); } } void TextureBrowser_deleteTag(){ GSList* selected = NULL; - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + auto selection = gtk_tree_view_get_selection(g_TextureBrowser.m_treeViewTags ); gtk_tree_selection_selected_foreach( selection, GtkTreeSelectionForeachFunc( TextureBrowser_selectionHelper ), &selected ); if ( g_slist_length( selected ) == 1 ) { // we only delete a single tag - auto result = ui::Widget(GTK_WIDGET( g_TextureBrowser.m_parent )).alert( "Are you sure you want to delete the selected tag?", "Delete Tag", ui::alert_type::YESNO, ui::alert_icon::Question ); + auto result = g_TextureBrowser.m_parent.alert( "Are you sure you want to delete the selected tag?", "Delete Tag", ui::alert_type::YESNO, ui::alert_icon::Question ); if ( result == ui::alert_response::YES ) { GtkTreeIter iterSelected; @@ -2346,17 +2335,17 @@ void TextureBrowser_deleteTag(){ gchar* tagSelected = (char*)selected->data; - bool row = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterSelected ) != 0; + bool row = gtk_tree_model_get_iter_first(g_TextureBrowser.m_all_tags_list, &iterSelected ) != 0; while ( row ) { - gtk_tree_model_get( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterSelected, TAG_COLUMN, &rowTag, -1 ); + gtk_tree_model_get(g_TextureBrowser.m_all_tags_list, &iterSelected, TAG_COLUMN, &rowTag, -1 ); if ( strcmp( rowTag, tagSelected ) == 0 ) { gtk_list_store_remove( g_TextureBrowser.m_all_tags_list, &iterSelected ); break; } - row = gtk_tree_model_iter_next( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterSelected ) != 0; + row = gtk_tree_model_iter_next(g_TextureBrowser.m_all_tags_list, &iterSelected ) != 0; } TagBuilder.DeleteTag( tagSelected ); @@ -2367,7 +2356,7 @@ void TextureBrowser_deleteTag(){ } } else { - ui::Widget(GTK_WIDGET( g_TextureBrowser.m_parent )).alert( "Select a single tag for deletion." ); + g_TextureBrowser.m_parent.alert( "Select a single tag for deletion." ); } } @@ -2419,7 +2408,7 @@ void TextureBrowser_RefreshShaders(){ ScopeDisableScreenUpdates disableScreenUpdates( "Processing...", "Loading Shaders" ); GlobalShaderSystem().refresh(); UpdateAllWindows(); - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(GlobalTextureBrowser().m_treeViewTree)); + auto selection = gtk_tree_view_get_selection(GlobalTextureBrowser().m_treeViewTree); GtkTreeModel* model = NULL; GtkTreeIter iter; if ( gtk_tree_selection_get_selected (selection, &model, &iter) ) @@ -2459,7 +2448,7 @@ void TextureBrowser_showAll(){ } void TextureBrowser_showUntagged(){ - auto result = ui::Widget(GTK_WIDGET( g_TextureBrowser.m_parent )).alert( "WARNING! This function might need a lot of memory and time. Are you sure you want to use it?", "Show Untagged", ui::alert_type::YESNO, ui::alert_icon::Warning ); + auto result = g_TextureBrowser.m_parent.alert( "WARNING! This function might need a lot of memory and time. Are you sure you want to use it?", "Show Untagged", ui::alert_type::YESNO, ui::alert_icon::Warning ); if ( result == ui::alert_response::YES ) { g_TextureBrowser.m_found_shaders.clear(); @@ -2511,7 +2500,7 @@ void TextureBrowser_EnableAlpha(){ TextureBrowser_activeShadersChanged( GlobalTextureBrowser() ); } -void TextureBrowser_exportTitle( const StringImportCallback& importer ){ +void TextureBrowser_exportTitle( const ImportExportCallback::Import_t& importer ){ StringOutputStream buffer( 64 ); buffer << "Textures: "; if ( !string_empty( g_TextureBrowser_currentDirectory.c_str() ) ) { @@ -2545,9 +2534,9 @@ void TextureScaleImport( TextureBrowser& textureBrowser, int value ){ break; } } -typedef ReferenceCaller1 TextureScaleImportCaller; +typedef ReferenceCaller TextureScaleImportCaller; -void TextureScaleExport( TextureBrowser& textureBrowser, const IntImportCallback& importer ){ +void TextureScaleExport( TextureBrowser& textureBrowser, const ImportExportCallback::Import_t& importer ){ switch ( textureBrowser.m_textureScale ) { case 10: @@ -2567,7 +2556,7 @@ void TextureScaleExport( TextureBrowser& textureBrowser, const IntImportCallback break; } } -typedef ReferenceCaller1 TextureScaleExportCaller; +typedef ReferenceCaller::Import_t&), TextureScaleExport> TextureScaleExportCaller; void UniformTextureSizeImport( TextureBrowser& textureBrowser, int value ){ @@ -2575,21 +2564,21 @@ void UniformTextureSizeImport( TextureBrowser& textureBrowser, int value ){ if ( value > 16 ) TextureBrowser_setUniformSize( textureBrowser, value ); } -typedef ReferenceCaller1 UniformTextureSizeImportCaller; +typedef ReferenceCaller UniformTextureSizeImportCaller; void TextureBrowser_constructPreferences( PreferencesPage& page ){ page.appendCheckBox( "", "Texture scrollbar", - TextureBrowserImportShowScrollbarCaller( GlobalTextureBrowser() ), - BoolExportCaller( GlobalTextureBrowser().m_showTextureScrollbar ) + {TextureBrowserImportShowScrollbarCaller( GlobalTextureBrowser() ), + BoolExportCaller( GlobalTextureBrowser().m_showTextureScrollbar )} ); { const char* texture_scale[] = { "10%", "25%", "50%", "100%", "200%" }; page.appendCombo( "Texture Thumbnail Scale", STRING_ARRAY_RANGE( texture_scale ), - IntImportCallback( TextureScaleImportCaller( GlobalTextureBrowser() ) ), - IntExportCallback( TextureScaleExportCaller( GlobalTextureBrowser() ) ) + {ImportExportCallback::Import_t( TextureScaleImportCaller( GlobalTextureBrowser() ) ), + ImportExportCallback::Export_t( TextureScaleExportCaller( GlobalTextureBrowser() ) )} ); } page.appendSpinner( @@ -2609,37 +2598,37 @@ void TextureBrowser_constructPage( PreferenceGroup& group ){ TextureBrowser_constructPreferences( page ); } void TextureBrowser_registerPreferencesPage(){ - PreferencesDialog_addSettingsPage( FreeCaller1() ); + PreferencesDialog_addSettingsPage( makeCallbackF(TextureBrowser_constructPage) ); } #include "preferencesystem.h" #include "stringio.h" -typedef ReferenceCaller1 TextureBrowserSetScaleCaller; +typedef ReferenceCaller TextureBrowserSetScaleCaller; void TextureClipboard_textureSelected( const char* shader ); void TextureBrowser_Construct(){ - GlobalCommands_insert( "ShaderInfo", FreeCaller() ); - GlobalCommands_insert( "ShowUntagged", FreeCaller() ); - GlobalCommands_insert( "AddTag", FreeCaller() ); - GlobalCommands_insert( "RenameTag", FreeCaller() ); - GlobalCommands_insert( "DeleteTag", FreeCaller() ); - GlobalCommands_insert( "CopyTag", FreeCaller() ); - GlobalCommands_insert( "PasteTag", FreeCaller() ); - GlobalCommands_insert( "RefreshShaders", FreeCaller() ); - GlobalToggles_insert( "ShowInUse", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hideunused_item ), Accelerator( 'U' ) ); - GlobalCommands_insert( "ShowAllTextures", FreeCaller(), Accelerator( 'A', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "ToggleTextures", FreeCaller(), Accelerator( 'T' ) ); - GlobalToggles_insert( "ToggleShowShaders", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaders_item ) ); - GlobalToggles_insert( "ToggleShowShaderlistOnly", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaderlistonly_item ) ); - GlobalToggles_insert( "FixedSize", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_fixedsize_item ) ); - GlobalToggles_insert( "FilterMissing", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_filternotex_item ) ); - GlobalToggles_insert( "FilterFallback", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hidenotex_item ) ); - GlobalToggles_insert( "EnableAlpha", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_enablealpha_item ) ); + GlobalCommands_insert( "ShaderInfo", makeCallbackF(TextureBrowser_shaderInfo) ); + GlobalCommands_insert( "ShowUntagged", makeCallbackF(TextureBrowser_showUntagged) ); + GlobalCommands_insert( "AddTag", makeCallbackF(TextureBrowser_addTag) ); + GlobalCommands_insert( "RenameTag", makeCallbackF(TextureBrowser_renameTag) ); + GlobalCommands_insert( "DeleteTag", makeCallbackF(TextureBrowser_deleteTag) ); + GlobalCommands_insert( "CopyTag", makeCallbackF(TextureBrowser_copyTag) ); + GlobalCommands_insert( "PasteTag", makeCallbackF(TextureBrowser_pasteTag) ); + GlobalCommands_insert( "RefreshShaders", makeCallbackF(VFS_Refresh) ); + GlobalToggles_insert( "ShowInUse", makeCallbackF(TextureBrowser_ToggleHideUnused), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hideunused_item ), Accelerator( 'U' ) ); + GlobalCommands_insert( "ShowAllTextures", makeCallbackF(TextureBrowser_showAll), Accelerator( 'A', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "ToggleTextures", makeCallbackF(TextureBrowser_toggleShow), Accelerator( 'T' ) ); + GlobalToggles_insert( "ToggleShowShaders", makeCallbackF(TextureBrowser_ToggleShowShaders), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaders_item ) ); + GlobalToggles_insert( "ToggleShowShaderlistOnly", makeCallbackF(TextureBrowser_ToggleShowShaderListOnly), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaderlistonly_item ) ); + GlobalToggles_insert( "FixedSize", makeCallbackF(TextureBrowser_FixedSize), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_fixedsize_item ) ); + GlobalToggles_insert( "FilterMissing", makeCallbackF(TextureBrowser_FilterMissing), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_filternotex_item ) ); + GlobalToggles_insert( "FilterFallback", makeCallbackF(TextureBrowser_FilterFallback), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hidenotex_item ) ); + GlobalToggles_insert( "EnableAlpha", makeCallbackF(TextureBrowser_EnableAlpha), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_enablealpha_item ) ); GlobalPreferenceSystem().registerPreference( "TextureScale", makeSizeStringImportCallback( TextureBrowserSetScaleCaller( g_TextureBrowser ) ), @@ -2663,7 +2652,7 @@ void TextureBrowser_Construct(){ g_TextureBrowser.shader = texdef_name_default(); - Textures_setModeChangedNotify( ReferenceCaller( g_TextureBrowser ) ); + Textures_setModeChangedNotify( ReferenceCaller( g_TextureBrowser ) ); TextureBrowser_registerPreferencesPage(); @@ -2674,5 +2663,5 @@ void TextureBrowser_Construct(){ void TextureBrowser_Destroy(){ GlobalShaderSystem().detach( g_ShadersObserver ); - Textures_setModeChangedNotify( Callback() ); + Textures_setModeChangedNotify( Callback() ); }