X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=radiant%2Ftexwindow.cpp;h=89336949ec01e1d6d9863deda69c162e73becf22;hb=32dc1da26645b97a5823ff22175000542225c6dd;hp=8a760e030b5932dcaf5c8612646921868b5457f8;hpb=fea0d2e6575b21945c4800805d66e43a2247ded5;p=xonotic%2Fnetradiant.git diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 8a760e03..89336949 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -32,6 +32,7 @@ #include "debugging/debugging.h" #include "warnings.h" +#include "defaults.h" #include "ifilesystem.h" #include "iundo.h" #include "igl.h" @@ -86,9 +87,6 @@ #include "shaders.h" #include "commands.h" -#define NOTEX_BASENAME "notex" -#define SHADERNOTEX_BASENAME "shadernotex" - bool TextureBrowser_showWads(){ return !string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ); } @@ -102,7 +100,7 @@ bool string_equal_start( const char* string, StringRange start ){ typedef std::set TextureGroups; void TextureGroups_addWad( TextureGroups& groups, const char* archive ){ - if ( extension_equal( path_get_extension( archive ), "wad" ) ) { + if ( extension_equal_i( path_get_extension( archive ), "wad" ) ) { #if 1 groups.insert( archive ); #else @@ -111,6 +109,7 @@ void TextureGroups_addWad( TextureGroups& groups, const char* archive ){ #endif } } + typedef ReferenceCaller TextureGroupsAddWadCaller; namespace @@ -124,7 +123,9 @@ bool g_TextureBrowser_enableAlpha = true; CopiedString g_notex; CopiedString g_shadernotex; + bool isMissing(const char* name); + bool isNotex(const char* name); bool isMissing(const char* name){ @@ -138,10 +139,10 @@ bool isMissing(const char* name){ } bool isNotex(const char* name){ - if ( string_equal_suffix( name, "/" NOTEX_BASENAME ) ) { + if ( string_equal_suffix( name, "/" DEFAULT_NOTEX_BASENAME ) ) { return true; } - if ( string_equal_suffix( name, "/" SHADERNOTEX_BASENAME ) ) { + if ( string_equal_suffix( name, "/" DEFAULT_SHADERNOTEX_BASENAME ) ) { return true; } return false; @@ -167,6 +168,7 @@ void TextureGroups_addShader( TextureGroups& groups, const char* shaderName ){ } } } + typedef ReferenceCaller TextureGroupsAddShaderCaller; void TextureGroups_addDirectory( TextureGroups& groups, const char* directory ){ @@ -178,7 +180,9 @@ class DeferredAdjustment { gdouble m_value; guint m_handler; + typedef void ( *ValueChangedFunction )( void* data, gdouble value ); + ValueChangedFunction m_function; void* m_data; @@ -191,28 +195,31 @@ static gboolean deferred_value_changed( gpointer data ){ reinterpret_cast( data )->m_value = 0; return FALSE; } + public: DeferredAdjustment( ValueChangedFunction function, void* data ) : m_value( 0 ), m_handler( 0 ), m_function( function ), m_data( data ){ } + void flush(){ if ( m_handler != 0 ) { g_source_remove( m_handler ); deferred_value_changed( this ); } } + void value_changed( gdouble value ){ m_value = value; if ( m_handler == 0 ) { m_handler = g_idle_add( deferred_value_changed, this ); } } -static void adjustment_value_changed( GtkAdjustment *adjustment, DeferredAdjustment* self ){ + +static void adjustment_value_changed(ui::Adjustment adjustment, DeferredAdjustment* self ){ self->value_changed( gtk_adjustment_get_value(adjustment) ); } }; - class TextureBrowser; typedef ReferenceCaller TextureBrowserQueueDrawCaller; @@ -227,24 +234,31 @@ enum StartupShaders }; void TextureBrowser_hideUnusedExport( const Callback & importer ); + typedef FreeCaller &), TextureBrowser_hideUnusedExport> TextureBrowserHideUnusedExport; void TextureBrowser_showShadersExport( const Callback & importer ); + typedef FreeCaller &), TextureBrowser_showShadersExport> TextureBrowserShowShadersExport; void TextureBrowser_showShaderlistOnly( const Callback & importer ); + typedef FreeCaller &), TextureBrowser_showShaderlistOnly> TextureBrowserShowShaderlistOnlyExport; void TextureBrowser_fixedSize( const Callback & importer ); + typedef FreeCaller &), TextureBrowser_fixedSize> TextureBrowserFixedSizeExport; void TextureBrowser_filterMissing( const Callback & importer ); + typedef FreeCaller &), TextureBrowser_filterMissing> TextureBrowserFilterMissingExport; void TextureBrowser_filterFallback( const Callback & importer ); + typedef FreeCaller &), TextureBrowser_filterFallback> TextureBrowserFilterFallbackExport; void TextureBrowser_enableAlpha( const Callback & importer ); + typedef FreeCaller &), TextureBrowser_enableAlpha> TextureBrowserEnableAlphaExport; class TextureBrowser @@ -259,7 +273,7 @@ CopiedString shader; ui::Window m_parent{ui::null}; ui::GLArea m_gl_widget{ui::null}; ui::Widget m_texture_scroll{ui::null}; -ui::TreeView m_treeViewTree{ui::null}; +ui::TreeView m_treeViewTree{ui::New}; ui::TreeView m_treeViewTags{ui::null}; ui::Frame m_tag_frame{ui::null}; ui::ListStore m_assigned_store{ui::null}; @@ -310,6 +324,7 @@ bool m_searchedTags; bool m_tags; // The uniform size (in pixels) that textures are resized to when m_resizeTextures is true. int m_uniformTextureSize; + // Return the display width of a texture in the texture browser int getTextureWidth( qtexture_t* tex ){ int width; @@ -328,6 +343,7 @@ int getTextureWidth( qtexture_t* tex ){ } return width; } + // Return the display height of a texture in the texture browser int getTextureHeight( qtexture_t* tex ){ int height; @@ -347,7 +363,7 @@ int getTextureHeight( qtexture_t* tex ){ } TextureBrowser() : - m_texture_scroll( 0 ), + m_texture_scroll( ui::null ), m_hideunused_item( TextureBrowserHideUnusedExport() ), m_hidenotex_item( TextureBrowserFilterFallbackExport() ), m_showshaders_item( TextureBrowserShowShadersExport() ), @@ -648,8 +664,10 @@ void realise(){ m_realiseCallbacks(); TextureBrowser_constructTreeStore(); } + void unrealise(){ } + void insert( const SignalHandler& handler ){ m_realiseCallbacks.connectLast( handler ); } @@ -721,14 +739,27 @@ bool texture_name_ignore( const char* name ){ endswith( strTemp.c_str(), ".diffuse" ) || endswith( strTemp.c_str(), ".blend" ) || endswith( strTemp.c_str(), ".alpha" ) || - endswith( strTemp.c_str(), "_norm" ) || + endswith( strTemp.c_str(), "_alpha" ) || + /* Quetoo */ + endswith( strTemp.c_str(), "_h" ) || + endswith( strTemp.c_str(), "_local" ) || + endswith( strTemp.c_str(), "_nm" ) || + endswith( strTemp.c_str(), "_s" ) || + /* DarkPlaces */ endswith( strTemp.c_str(), "_bump" ) || endswith( strTemp.c_str(), "_glow" ) || endswith( strTemp.c_str(), "_gloss" ) || + endswith( strTemp.c_str(), "_luma" ) || + endswith( strTemp.c_str(), "_norm" ) || endswith( strTemp.c_str(), "_pants" ) || endswith( strTemp.c_str(), "_shirt" ) || endswith( strTemp.c_str(), "_reflect" ) || - endswith( strTemp.c_str(), "_alpha" ) || + /* Unvanquished */ + endswith( strTemp.c_str(), "_d" ) || + endswith( strTemp.c_str(), "_n" ) || + endswith( strTemp.c_str(), "_p" ) || + endswith( strTemp.c_str(), "_g" ) || + endswith( strTemp.c_str(), "_a" ) || 0; } @@ -755,7 +786,6 @@ void TextureBrowser_updateTitle(){ } - class TextureCategoryLoadShader { const char* m_directory; @@ -767,6 +797,7 @@ TextureCategoryLoadShader( const char* directory, std::size_t& count ) : m_directory( directory ), m_count( count ){ m_count = 0; } + void operator()( const char* name ) const { if ( shader_equal_prefix( name, "textures/" ) && shader_equal_prefix( name + string_length( "textures/" ), m_directory ) ) { @@ -796,6 +827,7 @@ void TextureDirectory_loadTexture( const char* directory, const char* texture ){ IShader* shader = QERApp_Shader_ForName( name.c_str() ); shader->DecRef(); } + typedef ConstPointerCaller TextureDirectoryLoadTextureCaller; class LoadTexturesByTypeVisitor : public ImageModules::Visitor @@ -805,6 +837,7 @@ public: LoadTexturesByTypeVisitor( const char* dirstring ) : m_dirstring( dirstring ){ } + void visit( const char* minor, const _QERPlugImageTable& table ) const { GlobalFileSystem().forEachFile( m_dirstring, minor, TextureDirectoryLoadTextureCaller( m_dirstring ) ); } @@ -871,36 +904,43 @@ bool TextureBrowser_hideUnused(); void TextureBrowser_hideUnusedExport( const Callback & importer ){ importer( TextureBrowser_hideUnused() ); } + typedef FreeCaller &), TextureBrowser_hideUnusedExport> TextureBrowserHideUnusedExport; void TextureBrowser_showShadersExport( const Callback & importer ){ importer( GlobalTextureBrowser().m_showShaders ); } + typedef FreeCaller &), TextureBrowser_showShadersExport> TextureBrowserShowShadersExport; void TextureBrowser_showShaderlistOnly( const Callback & importer ){ importer( g_TextureBrowser_shaderlistOnly ); } + typedef FreeCaller &), TextureBrowser_showShaderlistOnly> TextureBrowserShowShaderlistOnlyExport; void TextureBrowser_fixedSize( const Callback & importer ){ importer( g_TextureBrowser_fixedSize ); } + typedef FreeCaller &), TextureBrowser_fixedSize> TextureBrowser_FixedSizeExport; void TextureBrowser_filterMissing( const Callback & importer ){ importer( g_TextureBrowser_filterMissing ); } + typedef FreeCaller &), TextureBrowser_filterMissing> TextureBrowser_filterMissingExport; void TextureBrowser_filterFallback( const Callback & importer ){ importer( g_TextureBrowser_filterFallback ); } + typedef FreeCaller &), TextureBrowser_filterFallback> TextureBrowser_filterFallbackExport; void TextureBrowser_enableAlpha( const Callback & importer ){ importer( g_TextureBrowser_enableAlpha ); } + typedef FreeCaller &), TextureBrowser_enableAlpha> TextureBrowser_enableAlphaExport; void TextureBrowser_SetHideUnused( TextureBrowser& textureBrowser, bool hideUnused ){ @@ -1202,6 +1242,7 @@ void Texture_Draw( TextureBrowser& textureBrowser ){ glBegin( GL_QUADS ); int font_height = TextureBrowser_fontHeight( textureBrowser ); for ( int i = 0; i < nHeight; i += 8 ) + { for ( int j = 0; j < nWidth; j += 8 ) { unsigned char color = (i + j) / 8 % 2 ? 0x66 : 0x99; @@ -1215,6 +1256,7 @@ void Texture_Draw( TextureBrowser& textureBrowser ){ glVertex2i(x + left, y - nHeight - font_height + bottom); glVertex2i(x + right, y - nHeight - font_height + bottom); } + } glEnd(); glEnable( GL_TEXTURE_2D ); } @@ -1421,7 +1463,7 @@ void TextureBrowser_scrollChanged( void* data, gdouble value ){ TextureBrowser_setOriginY( *reinterpret_cast( data ), -(int)value ); } -static void TextureBrowser_verticalScroll( GtkAdjustment *adjustment, TextureBrowser* textureBrowser ){ +static void TextureBrowser_verticalScroll(ui::Adjustment adjustment, TextureBrowser* textureBrowser ){ textureBrowser->m_scrollAdjustment.value_changed( gtk_adjustment_get_value(adjustment) ); } @@ -1542,7 +1584,7 @@ TextureGroups TextureGroups_constructTreeView(){ void TextureBrowser_constructTreeStore(){ TextureGroups groups = TextureGroups_constructTreeView(); - auto store = ui::TreeStore(gtk_tree_store_new( 1, G_TYPE_STRING )); + auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING )); TextureGroups_constructTreeModel( groups, store ); gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTree, store); @@ -1552,7 +1594,7 @@ void TextureBrowser_constructTreeStore(){ void TextureBrowser_constructTreeStoreTags(){ TextureGroups groups; - auto store = ui::TreeStore(gtk_tree_store_new( 1, G_TYPE_STRING )); + auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING )); auto model = g_TextureBrowser.m_all_tags_list; gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTags, model ); @@ -1560,7 +1602,7 @@ void TextureBrowser_constructTreeStoreTags(){ g_object_unref( G_OBJECT( store ) ); } -void TreeView_onRowActivated( ui::TreeView treeview, GtkTreePath* path, ui::TreeViewColumn col, gpointer userdata ){ +void TreeView_onRowActivated( ui::TreeView treeview, ui::TreePath path, ui::TreeViewColumn col, gpointer userdata ){ GtkTreeIter iter; auto model = gtk_tree_view_get_model(treeview ); @@ -1586,7 +1628,6 @@ void TreeView_onRowActivated( ui::TreeView treeview, GtkTreePath* path, ui::Tree } void TextureBrowser_createTreeViewTree(){ - 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(g_TextureBrowser.m_treeViewTree, FALSE ); @@ -1599,7 +1640,9 @@ void TextureBrowser_createTreeViewTree(){ } void TextureBrowser_addTag(); + void TextureBrowser_renameTag(); + void TextureBrowser_deleteTag(); void TextureBrowser_createContextMenu( ui::Widget treeview, GdkEventButton *event ){ @@ -1734,7 +1777,7 @@ ui::MenuItem TextureBrowser_constructTagsMenu( ui::Menu menu ){ return textures_menu_item; } -gboolean TextureBrowser_tagMoveHelper( ui::TreeModel model, ui::TreePath path, GtkTreeIter* iter, GSList** selected ){ +gboolean TextureBrowser_tagMoveHelper( ui::TreeModel model, ui::TreePath path, GtkTreeIter iter, GSList** selected ){ g_assert( selected != NULL ); auto rowref = gtk_tree_row_reference_new( model, path ); @@ -1922,7 +1965,7 @@ void TextureBrowser_toggleSearchButton(){ } void TextureBrowser_constructTagNotebook(){ - g_TextureBrowser.m_tag_notebook = ui::Widget(gtk_notebook_new()); + g_TextureBrowser.m_tag_notebook = ui::Widget::from(gtk_notebook_new()); ui::Widget labelTags = ui::Label( "Tags" ); ui::Widget labelTextures = ui::Label( "Textures" ); @@ -1935,7 +1978,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 )); + auto image = ui::Widget::from(gtk_image_new_from_stock( GTK_STOCK_FIND, GTK_ICON_SIZE_SMALL_TOOLBAR )); 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"); @@ -1981,13 +2024,14 @@ void TextureBrowser_checkTagFile(){ } void TextureBrowser_SetNotex(){ - StringOutputStream name( 256 ); - name << GlobalRadiant().getAppPath() << "bitmaps/" NOTEX_BASENAME ".png"; - g_notex = name.c_str(); + IShader* notex = QERApp_Shader_ForName( DEFAULT_NOTEX_NAME ); + IShader* shadernotex = QERApp_Shader_ForName( DEFAULT_SHADERNOTEX_NAME ); + + g_notex = notex->getTexture()->name; + g_shadernotex = shadernotex->getTexture()->name; - name = StringOutputStream(256); - name << GlobalRadiant().getAppPath() << "bitmaps/" SHADERNOTEX_BASENAME " .png"; - g_shadernotex = name.c_str(); + notex->DecRef(); + shadernotex->DecRef(); } ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ @@ -2011,7 +2055,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ ui::Widget menu_bar{ui::null}; { // menu bar - menu_bar = ui::Widget(gtk_menu_bar_new()); + menu_bar = ui::Widget::from(gtk_menu_bar_new()); 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 ); @@ -2040,12 +2084,12 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ g_TextureBrowser.m_treeViewTree.show(); } { // gl_widget scrollbar - ui::Widget w = ui::Widget(gtk_vscrollbar_new( ui::Adjustment( 0,0,0,1,1,0 ) )); + auto w = ui::Widget::from(gtk_vscrollbar_new( ui::Adjustment( 0,0,0,1,1,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 ) )); + auto vadjustment = ui::Adjustment::from(gtk_range_get_adjustment( GTK_RANGE( g_TextureBrowser.m_texture_scroll ) )); vadjustment.connect( "value_changed", G_CALLBACK( TextureBrowser_verticalScroll ), &g_TextureBrowser ); g_TextureBrowser.m_texture_scroll.visible(g_TextureBrowser.m_showTextureScrollbar); @@ -2072,7 +2116,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ // tag stuff 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 )); + g_TextureBrowser.m_all_tags_list = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_all_tags_list ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); @@ -2126,14 +2170,14 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ 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 )); + g_TextureBrowser.m_assigned_store = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); 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(ui::New); - g_TextureBrowser.m_assigned_tree = ui::TreeView(ui::TreeModel(g_TextureBrowser.m_assigned_store )); + g_TextureBrowser.m_assigned_tree = ui::TreeView(ui::TreeModel::from(g_TextureBrowser.m_assigned_store._handle)); g_TextureBrowser.m_assigned_store.unref(); g_TextureBrowser.m_assigned_tree.connect( "row-activated", (GCallback) TextureBrowser_removeTags, NULL ); gtk_tree_view_set_headers_visible(g_TextureBrowser.m_assigned_tree, FALSE ); @@ -2155,13 +2199,13 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ 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 )); + g_TextureBrowser.m_available_store = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); 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(ui::New); - g_TextureBrowser.m_available_tree = ui::TreeView(ui::TreeModel(g_TextureBrowser.m_available_store )); + g_TextureBrowser.m_available_tree = ui::TreeView(ui::TreeModel::from(g_TextureBrowser.m_available_store._handle)); g_TextureBrowser.m_available_store.unref(); g_TextureBrowser.m_available_tree.connect( "row-activated", (GCallback) TextureBrowser_assignTags, NULL ); gtk_tree_view_set_headers_visible(g_TextureBrowser.m_available_tree, FALSE ); @@ -2181,8 +2225,8 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ { // tag arrow buttons 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 )); + auto m_arrow_left = ui::Widget::from(gtk_arrow_new( GTK_ARROW_LEFT, GTK_SHADOW_OUT )); + auto m_arrow_right = ui::Widget::from(gtk_arrow_new( GTK_ARROW_RIGHT, GTK_SHADOW_OUT )); m_btn_left.add(m_arrow_left); m_btn_right.add(m_arrow_right); @@ -2321,7 +2365,7 @@ void TextureBrowser_renameTag(){ } else { - g_TextureBrowser.m_parent.alert( "Select a single tag for renaming." ); + ui::alert( g_TextureBrowser.m_parent, "Select a single tag for renaming." ); } } @@ -2332,7 +2376,7 @@ void TextureBrowser_deleteTag(){ gtk_tree_selection_selected_foreach( selection, GtkTreeSelectionForeachFunc( TextureBrowser_selectionHelper ), &selected ); if ( g_slist_length( selected ) == 1 ) { // we only delete a single tag - 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 ); + auto result = ui::alert( g_TextureBrowser.m_parent, "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; @@ -2361,7 +2405,7 @@ void TextureBrowser_deleteTag(){ } } else { - g_TextureBrowser.m_parent.alert( "Select a single tag for deletion." ); + ui::alert( g_TextureBrowser.m_parent, "Select a single tag for deletion." ); } } @@ -2453,7 +2497,7 @@ void TextureBrowser_showAll(){ } void TextureBrowser_showUntagged(){ - 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 ); + auto result = ui::alert( g_TextureBrowser.m_parent, "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(); @@ -2600,6 +2644,7 @@ void TextureBrowser_constructPage( PreferenceGroup& group ){ PreferencesPage page( group.createPage( "Texture Browser", "Texture Browser Preferences" ) ); TextureBrowser_constructPreferences( page ); } + void TextureBrowser_registerPreferencesPage(){ PreferencesDialog_addSettingsPage( makeCallbackF(TextureBrowser_constructPage) ); } @@ -2652,8 +2697,15 @@ void TextureBrowser_Construct(){ TextureBrowser_textureSelected = TextureClipboard_textureSelected; } + void TextureBrowser_Destroy(){ GlobalShaderSystem().detach( g_ShadersObserver ); Textures_setModeChangedNotify( Callback() ); } + +#if WORKAROUND_WINDOWS_GTK2_GLWIDGET +ui::GLArea TextureBrowser_getGLWidget(){ + return GlobalTextureBrowser().m_gl_widget; +} +#endif // WORKAROUND_WINDOWS_GTK2_GLWIDGET