ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-02-23 04:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Ability to have icons for the entity menu items (right click 2d-view menu)

Browse source
This commit is contained in:
Pan7 2015-09-14 20:37:16 +02:00
parent 5c9c2d44d5
commit 007cd5e0d4
1 changed files with 41 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
radiant/xywindow.cpp
View file

@ -1440,6 +1440,39 @@ qboolean XYWnd::DragDelta( int x, int y, vec3_t move ){
return false; return false;
} }
static GtkWidget * create_entity_menu_item( GtkWidget *submenu, CString strName )
{
GtkWidget *item, *box, *icon, *label;
CString filepath;
GdkPixbuf *pixbuf;
filepath = g_strGameToolsPath;
filepath += "entity_icons/";
filepath += strName;
filepath += ".png";
item = gtk_menu_item_new();
box = gtk_box_new( GTK_ORIENTATION_HORIZONTAL, 6 );
gtk_container_add( GTK_CONTAINER( item ), box );
gtk_widget_show( box );
pixbuf = gdk_pixbuf_new_from_file( filepath, NULL );
if( pixbuf )
{
icon = gtk_image_new_from_pixbuf( pixbuf );
gtk_container_add( GTK_CONTAINER( box ), icon );
gtk_widget_show( icon );
g_object_unref( pixbuf );
}
label = gtk_label_new( strName );
gtk_container_add( GTK_CONTAINER( box ), label );
gtk_widget_show( label );
return item;
}
void XYWnd::HandleDrop(){ void XYWnd::HandleDrop(){
if ( g_PrefsDlg.m_bRightClick == false ) { if ( g_PrefsDlg.m_bRightClick == false ) {
return; return;
@ -1509,12 +1542,14 @@ void XYWnd::HandleDrop(){
CString strRight = strName.Right( strName.GetLength() - n_ - 1 ); CString strRight = strName.Right( strName.GetLength() - n_ - 1 );
if ( strLeft == strActive ) { // this is a child if ( strLeft == strActive ) { // this is a child
assert( submenu ); assert( submenu );
item = gtk_menu_item_new_with_label( strName ); CheckMenuSplitting( submenu );
item = create_entity_menu_item( submenu, strName );
g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ), g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ),
// g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ), // g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ),
GINT_TO_POINTER( nID++ ) ); GINT_TO_POINTER( nID++ ) );
gtk_widget_show( item ); gtk_widget_show( item );
CheckMenuSplitting( submenu );
gtk_menu_shell_append( GTK_MENU_SHELL( submenu ), item ); gtk_menu_shell_append( GTK_MENU_SHELL( submenu ), item );
} }
else else
@ -1534,7 +1569,8 @@ void XYWnd::HandleDrop(){
submenu = gtk_menu_new(); submenu = gtk_menu_new();
submenu_root = submenu; submenu_root = submenu;
item = gtk_menu_item_new_with_label( strName ); //item = gtk_menu_item_new_with_label( strName );
item = create_entity_menu_item( submenu, strName );
g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ), g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ),
// g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ), // g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ),
GINT_TO_POINTER( nID++ ) ); GINT_TO_POINTER( nID++ ) );
@ -1557,7 +1593,8 @@ void XYWnd::HandleDrop(){
} }
strActive = ""; strActive = "";
item = gtk_menu_item_new_with_label( strName ); //item = gtk_menu_item_new_with_label( strName );
item = create_entity_menu_item( menu, strName );
g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ), g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ),
// g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ), // g_signal_connect( item, "activate", G_CALLBACK( HandleCommand ),
GINT_TO_POINTER( nID++ ) ); GINT_TO_POINTER( nID++ ) );