From 31014dcf4ac03b8596e274134032a24a0302ac86 Mon Sep 17 00:00:00 2001 From: Garux Date: Sun, 5 Jan 2020 01:44:01 +0300 Subject: [PATCH] * brushexport plugin: add 'Ignored materials' on Enter, delete on Delete --- contrib/brushexport/callbacks.cpp | 10 ++++- contrib/brushexport/callbacks.h | 1 + contrib/brushexport/export.cpp | 1 + contrib/brushexport/interface.cpp | 73 +++++++++++-------------------- 4 files changed, 36 insertions(+), 49 deletions(-) diff --git a/contrib/brushexport/callbacks.cpp b/contrib/brushexport/callbacks.cpp index ea1471ff..681c4707 100644 --- a/contrib/brushexport/callbacks.cpp +++ b/contrib/brushexport/callbacks.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include "qerplugin.h" @@ -11,8 +12,7 @@ void DestroyWindow(); //! TODO add tooltip for ignore: shader name after last slash, case sensitive // or make insensitive -//! TODO add ignore mat on ENTER, del on del -//! TODO ignore case in mat name comparison materials_comparator +//! TODO hide window on close namespace callbacks { void OnDestroy( GtkWidget* w, gpointer data ){ @@ -136,4 +136,10 @@ void OnRemoveMaterial( GtkButton* button, gpointer user_data ){ } } +gboolean OnRemoveMaterialKb( GtkWidget* widget, GdkEventKey* event, gpointer user_data ){ + if( event->keyval == GDK_Delete ) + OnRemoveMaterial( reinterpret_cast( widget ), NULL ); + return FALSE; +} + } // callbacks diff --git a/contrib/brushexport/callbacks.h b/contrib/brushexport/callbacks.h index 2aa885fc..48b8c112 100644 --- a/contrib/brushexport/callbacks.h +++ b/contrib/brushexport/callbacks.h @@ -7,5 +7,6 @@ void OnDestroy( GtkWidget *, gpointer ); void OnExportClicked( GtkButton *, gpointer ); void OnAddMaterial( GtkButton *, gpointer ); void OnRemoveMaterial( GtkButton *, gpointer ); +gboolean OnRemoveMaterialKb( GtkWidget *, GdkEventKey *, gpointer ); } // callbacks diff --git a/contrib/brushexport/export.cpp b/contrib/brushexport/export.cpp index 29db01e0..bde757cd 100644 --- a/contrib/brushexport/export.cpp +++ b/contrib/brushexport/export.cpp @@ -182,6 +182,7 @@ bool ExportDataAsWavefront::WriteToFile( const std::string& path, collapsemode m auto materials_comparator = []( const std::string& lhs, const std::string& rhs ) { return lhs < rhs; +// return string_less_nocase( lhs.c_str(), rhs.c_str() ); // can't squash varying cases just here, as usemtl is case sensitive in blender }; auto materials = std::map( materials_comparator ); diff --git a/contrib/brushexport/interface.cpp b/contrib/brushexport/interface.cpp index fba5b5ad..aa1b14b2 100644 --- a/contrib/brushexport/interface.cpp +++ b/contrib/brushexport/interface.cpp @@ -48,125 +48,120 @@ create_w_plugplug2( void ){ gtk_window_set_destroy_with_parent( GTK_WINDOW( w_plugplug2 ), TRUE ); vbox1 = gtk_vbox_new( FALSE, 0 ); - gtk_widget_show( vbox1 ); gtk_container_add( GTK_CONTAINER( w_plugplug2 ), vbox1 ); gtk_container_set_border_width( GTK_CONTAINER( vbox1 ), 5 ); hbox2 = gtk_hbox_new( TRUE, 5 ); - gtk_widget_show( hbox2 ); gtk_box_pack_start( GTK_BOX( vbox1 ), hbox2, FALSE, FALSE, 0 ); gtk_container_set_border_width( GTK_CONTAINER( hbox2 ), 5 ); vbox4 = gtk_vbox_new( TRUE, 0 ); - gtk_widget_show( vbox4 ); gtk_box_pack_start( GTK_BOX( hbox2 ), vbox4, TRUE, FALSE, 0 ); r_collapse = gtk_radio_button_new_with_mnemonic( NULL, "Collapse mesh" ); gtk_widget_set_tooltip_text( r_collapse, "Collapse all brushes into a single group" ); - gtk_widget_show( r_collapse ); gtk_box_pack_start( GTK_BOX( vbox4 ), r_collapse, FALSE, FALSE, 0 ); gtk_radio_button_set_group( GTK_RADIO_BUTTON( r_collapse ), r_collapse_group ); r_collapse_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( r_collapse ) ); r_collapsebymaterial = gtk_radio_button_new_with_mnemonic( NULL, "Collapse by material" ); gtk_widget_set_tooltip_text( r_collapsebymaterial, "Collapse into groups by material" ); - gtk_widget_show( r_collapsebymaterial ); gtk_box_pack_start( GTK_BOX( vbox4 ), r_collapsebymaterial, FALSE, FALSE, 0 ); gtk_radio_button_set_group( GTK_RADIO_BUTTON( r_collapsebymaterial ), r_collapse_group ); r_collapse_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( r_collapsebymaterial ) ); r_nocollapse = gtk_radio_button_new_with_mnemonic( NULL, "Don't collapse" ); gtk_widget_set_tooltip_text( r_nocollapse, "Every brush is stored in its own group" ); - gtk_widget_show( r_nocollapse ); gtk_box_pack_start( GTK_BOX( vbox4 ), r_nocollapse, FALSE, FALSE, 0 ); gtk_radio_button_set_group( GTK_RADIO_BUTTON( r_nocollapse ), r_collapse_group ); r_collapse_group = gtk_radio_button_get_group( GTK_RADIO_BUTTON( r_nocollapse ) ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( r_nocollapse ), TRUE ); vbox3 = gtk_vbox_new( FALSE, 0 ); - gtk_widget_show( vbox3 ); gtk_box_pack_start( GTK_BOX( hbox2 ), vbox3, FALSE, FALSE, 0 ); b_export = gtk_button_new_from_stock( "gtk-save" ); - gtk_widget_show( b_export ); gtk_box_pack_start( GTK_BOX( vbox3 ), b_export, TRUE, FALSE, 0 ); gtk_container_set_border_width( GTK_CONTAINER( b_export ), 5 ); gtk_widget_set_sensitive( b_export, FALSE ); b_exportAs = gtk_button_new_from_stock( "gtk-save-as" ); - gtk_widget_show( b_exportAs ); gtk_box_pack_start( GTK_BOX( vbox3 ), b_exportAs, TRUE, FALSE, 0 ); gtk_container_set_border_width( GTK_CONTAINER( b_exportAs ), 5 ); b_close = gtk_button_new_from_stock( "gtk-cancel" ); - gtk_widget_show( b_close ); gtk_box_pack_start( GTK_BOX( vbox3 ), b_close, TRUE, FALSE, 0 ); gtk_container_set_border_width( GTK_CONTAINER( b_close ), 5 ); vbox2 = gtk_vbox_new( FALSE, 5 ); - gtk_widget_show( vbox2 ); gtk_box_pack_start( GTK_BOX( vbox1 ), vbox2, TRUE, TRUE, 0 ); gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 2 ); label1 = gtk_label_new( "Ignored materials:" ); - gtk_widget_show( label1 ); gtk_box_pack_start( GTK_BOX( vbox2 ), label1, FALSE, FALSE, 0 ); scrolledwindow1 = gtk_scrolled_window_new( NULL, NULL ); - gtk_widget_show( scrolledwindow1 ); gtk_box_pack_start( GTK_BOX( vbox2 ), scrolledwindow1, TRUE, TRUE, 0 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC ); gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scrolledwindow1 ), GTK_SHADOW_IN ); - t_materialist = gtk_tree_view_new(); - gtk_widget_show( t_materialist ); - gtk_container_add( GTK_CONTAINER( scrolledwindow1 ), t_materialist ); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( t_materialist ), FALSE ); - gtk_tree_view_set_enable_search( GTK_TREE_VIEW( t_materialist ), FALSE ); + { + t_materialist = gtk_tree_view_new(); + gtk_container_add( GTK_CONTAINER( scrolledwindow1 ), t_materialist ); + gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( t_materialist ), FALSE ); + gtk_tree_view_set_enable_search( GTK_TREE_VIEW( t_materialist ), FALSE ); + + // column & renderer + GtkTreeViewColumn* col = gtk_tree_view_column_new(); + gtk_tree_view_column_set_title( col, "materials" ); + gtk_tree_view_append_column( GTK_TREE_VIEW( t_materialist ), col ); + GtkCellRenderer* renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW( t_materialist ), -1, "", renderer, "text", 0, NULL ); + + // list store + GtkListStore* ignorelist = gtk_list_store_new( 1, G_TYPE_STRING ); + gtk_tree_view_set_model( GTK_TREE_VIEW( t_materialist ), GTK_TREE_MODEL( ignorelist ) ); + g_object_unref( ignorelist ); + } ed_materialname = gtk_entry_new(); - gtk_widget_show( ed_materialname ); gtk_box_pack_start( GTK_BOX( vbox2 ), ed_materialname, FALSE, FALSE, 0 ); hbox1 = gtk_hbox_new( TRUE, 0 ); - gtk_widget_show( hbox1 ); gtk_box_pack_start( GTK_BOX( vbox2 ), hbox1, FALSE, FALSE, 0 ); b_addmaterial = gtk_button_new_from_stock( "gtk-add" ); - gtk_widget_show( b_addmaterial ); gtk_box_pack_start( GTK_BOX( hbox1 ), b_addmaterial, FALSE, FALSE, 0 ); b_removematerial = gtk_button_new_from_stock( "gtk-remove" ); - gtk_widget_show( b_removematerial ); gtk_box_pack_start( GTK_BOX( hbox1 ), b_removematerial, FALSE, FALSE, 0 ); t_limitmatnames = gtk_check_button_new_with_mnemonic( "Use short material names (max. 20 chars)" ); - gtk_widget_show( t_limitmatnames ); gtk_box_pack_end( GTK_BOX( vbox2 ), t_limitmatnames, FALSE, FALSE, 0 ); t_objects = gtk_check_button_new_with_mnemonic( "Create (o)bjects instead of (g)roups" ); - gtk_widget_show( t_objects ); gtk_box_pack_end( GTK_BOX( vbox2 ), t_objects, FALSE, FALSE, 0 ); t_weld = gtk_check_button_new_with_mnemonic( "Weld vertices" ); gtk_widget_set_tooltip_text( t_weld, "inside groups/objects" ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( t_weld ), TRUE ); - gtk_widget_show( t_weld ); gtk_box_pack_end( GTK_BOX( vbox2 ), t_weld, FALSE, FALSE, 0 ); t_exportmaterials = gtk_check_button_new_with_mnemonic( "Create material information (.mtl file)" ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( t_exportmaterials ), TRUE ); - gtk_widget_show( t_exportmaterials ); gtk_box_pack_end( GTK_BOX( vbox2 ), t_exportmaterials, FALSE, FALSE, 0 ); using namespace callbacks; g_signal_connect( G_OBJECT( w_plugplug2 ), "destroy", G_CALLBACK( OnDestroy ), NULL ); g_signal_connect_swapped( G_OBJECT( b_close ), "clicked", G_CALLBACK( OnDestroy ), NULL ); - g_signal_connect( ( gpointer )b_export, "clicked", G_CALLBACK( OnExportClicked ), NULL ); - g_signal_connect( ( gpointer )b_exportAs, "clicked", G_CALLBACK( OnExportClicked ), gpointer( 1 ) ); - g_signal_connect( ( gpointer )b_addmaterial, "clicked", G_CALLBACK( OnAddMaterial ), NULL ); - g_signal_connect( ( gpointer )b_removematerial, "clicked", G_CALLBACK( OnRemoveMaterial ), NULL ); + g_signal_connect( G_OBJECT( b_export ), "clicked", G_CALLBACK( OnExportClicked ), NULL ); + g_signal_connect( G_OBJECT( b_exportAs ), "clicked", G_CALLBACK( OnExportClicked ), gpointer( 1 ) ); + g_signal_connect( G_OBJECT( b_addmaterial ), "clicked", G_CALLBACK( OnAddMaterial ), NULL ); + g_signal_connect( G_OBJECT( ed_materialname ), "activate", G_CALLBACK( OnAddMaterial ), NULL ); // NB: wrong callback, but pointer casting works + g_signal_connect( G_OBJECT( b_removematerial ), "clicked", G_CALLBACK( OnRemoveMaterial ), NULL ); + g_signal_connect( G_OBJECT( t_materialist ), "key-press-event", G_CALLBACK( OnRemoveMaterialKb ), NULL ); + /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF( w_plugplug2, w_plugplug2, "w_plugplug2" ); @@ -201,23 +196,7 @@ GtkWidget* g_brushexp_window = 0; // spawn plugin window (and make sure it got destroyed first or never created) void CreateWindow( void ){ ASSERT_NOTNULL( !g_brushexp_window ); - - GtkWidget* wnd = create_w_plugplug2(); - - // column & renderer - GtkTreeViewColumn* col = gtk_tree_view_column_new(); - gtk_tree_view_column_set_title( col, "materials" ); - gtk_tree_view_append_column( GTK_TREE_VIEW( lookup_widget( wnd, "t_materialist" ) ), col ); - GtkCellRenderer* renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW( lookup_widget( wnd, "t_materialist" ) ), -1, "", renderer, "text", 0, NULL ); - - // list store - GtkListStore* ignorelist = gtk_list_store_new( 1, G_TYPE_STRING ); - gtk_tree_view_set_model( GTK_TREE_VIEW( lookup_widget( wnd, "t_materialist" ) ), GTK_TREE_MODEL( ignorelist ) ); - g_object_unref( ignorelist ); - - gtk_widget_show_all( wnd ); - g_brushexp_window = wnd; + gtk_widget_show_all( g_brushexp_window = create_w_plugplug2() ); } void DestroyWindow( void ){