Radiant:
misc... * fix: texBro & tags treeviews scroll focus follows folder selection; (text search shortcut is ctrl+f on windows) * fix: detached tags menu appearence * new icon
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 470 KiB |
BIN
icons/radiant_net.ico
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
|
|
@ -498,12 +498,13 @@ void DoAbout(){
|
|||
GtkVBox* vbox2 = create_dialog_vbox( 4 );
|
||||
gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( vbox2 ), TRUE, FALSE, 0 );
|
||||
{
|
||||
GtkFrame* frame = create_dialog_frame( 0, GTK_SHADOW_IN );
|
||||
gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( frame ), FALSE, FALSE, 0 );
|
||||
//GtkFrame* frame = create_dialog_frame( 0, GTK_SHADOW_IN );
|
||||
//gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( frame ), FALSE, FALSE, 0 );
|
||||
{
|
||||
GtkImage* image = new_local_image( "logo.png" );
|
||||
gtk_widget_show( GTK_WIDGET( image ) );
|
||||
gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( image ) );
|
||||
gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( image ), FALSE, FALSE, 0 );
|
||||
//gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( image ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2727,6 +2727,13 @@ GtkWindow* create_splash(){
|
|||
gtk_widget_show( GTK_WIDGET( image ) );
|
||||
gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( image ) );
|
||||
|
||||
if( gtk_image_get_storage_type( image ) == GTK_IMAGE_PIXBUF ){
|
||||
GdkBitmap* mask;
|
||||
GdkPixbuf* pix = gtk_image_get_pixbuf( image );
|
||||
gdk_pixbuf_render_pixmap_and_mask( pix, NULL, &mask, 255 );
|
||||
gtk_widget_shape_combine_mask ( GTK_WIDGET( window ), mask, 0, 0 );
|
||||
}
|
||||
|
||||
gtk_widget_set_size_request( GTK_WIDGET( window ), -1, -1 );
|
||||
gtk_widget_show( GTK_WIDGET( window ) );
|
||||
|
||||
|
|
|
|||
|
|
@ -2117,7 +2117,8 @@ GtkWidget* TextureBrowser_constructWindow( GtkWindow* 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 ), GTK_WIDGET( g_TextureBrowser.m_treeViewTree ) );
|
||||
gtk_container_add( GTK_CONTAINER( g_TextureBrowser.m_scr_win_tree ), GTK_WIDGET( g_TextureBrowser.m_treeViewTree ) );
|
||||
gtk_widget_show( GTK_WIDGET( g_TextureBrowser.m_treeViewTree ) );
|
||||
}
|
||||
{ // gl_widget scrollbar
|
||||
|
|
@ -2162,6 +2163,7 @@ GtkWidget* TextureBrowser_constructWindow( GtkWindow* toplevel ){
|
|||
}
|
||||
{ // tag menu bar
|
||||
GtkWidget* menu_tags = gtk_menu_new();
|
||||
gtk_menu_set_title( GTK_MENU( menu_tags ), "Tags" );
|
||||
//GtkWidget* tags_item = (GtkWidget*)
|
||||
TextureBrowser_constructTagsMenu( GTK_MENU( menu_tags ) );
|
||||
//gtk_menu_item_set_submenu( GTK_MENU_ITEM( tags_item ), menu_tags );
|
||||
|
|
@ -2180,6 +2182,9 @@ GtkWidget* TextureBrowser_constructWindow( GtkWindow* toplevel ){
|
|||
GTK_WIDGET_UNSET_FLAGS( GTK_WIDGET( button ), GTK_CAN_DEFAULT );
|
||||
gtk_toolbar_append_element( toolbar, GTK_TOOLBAR_CHILD_WIDGET, GTK_WIDGET( button ), "", "Tags", "", 0, 0, 0 );
|
||||
g_signal_connect( G_OBJECT( button ), "clicked", G_CALLBACK( Popup_View_Menu ), menu_tags );
|
||||
|
||||
//to show detached menu over floating tex bro and main wnd...
|
||||
gtk_menu_attach_to_widget( GTK_MENU( menu_tags ), GTK_WIDGET( button ), NULL );
|
||||
}
|
||||
{ // Tag TreeView
|
||||
g_TextureBrowser.m_scr_win_tags = gtk_scrolled_window_new( NULL, NULL );
|
||||
|
|
@ -2193,7 +2198,8 @@ GtkWidget* TextureBrowser_constructWindow( GtkWindow* toplevel ){
|
|||
GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( 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 ), GTK_WIDGET( g_TextureBrowser.m_treeViewTags ) );
|
||||
gtk_container_add( GTK_CONTAINER( g_TextureBrowser.m_scr_win_tags ), GTK_WIDGET( g_TextureBrowser.m_treeViewTags ) );
|
||||
gtk_widget_show( GTK_WIDGET( g_TextureBrowser.m_treeViewTags ) );
|
||||
}
|
||||
{ // Texture/Tag notebook
|
||||
|
|
@ -2242,7 +2248,8 @@ GtkWidget* TextureBrowser_constructWindow( GtkWindow* toplevel ){
|
|||
gtk_widget_show( g_TextureBrowser.m_assigned_tree );
|
||||
|
||||
gtk_widget_show( scrolled_win );
|
||||
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 ), GTK_WIDGET( g_TextureBrowser.m_assigned_tree ) );
|
||||
gtk_container_add( GTK_CONTAINER( scrolled_win ), GTK_WIDGET( g_TextureBrowser.m_assigned_tree ) );
|
||||
|
||||
gtk_table_attach( GTK_TABLE( frame_table ), scrolled_win, 0, 1, 1, 3, GTK_FILL, GTK_FILL, 0, 0 );
|
||||
}
|
||||
|
|
@ -2270,7 +2277,8 @@ GtkWidget* TextureBrowser_constructWindow( GtkWindow* toplevel ){
|
|||
gtk_widget_show( g_TextureBrowser.m_available_tree );
|
||||
|
||||
gtk_widget_show( scrolled_win );
|
||||
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 ), GTK_WIDGET( g_TextureBrowser.m_available_tree ) );
|
||||
gtk_container_add( GTK_CONTAINER( scrolled_win ), GTK_WIDGET( g_TextureBrowser.m_available_tree ) );
|
||||
|
||||
gtk_table_attach( GTK_TABLE( frame_table ), scrolled_win, 2, 3, 1, 3, GTK_FILL, GTK_FILL, 0, 0 );
|
||||
}
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 278 B After Width: | Height: | Size: 278 B |
|
Before Width: | Height: | Size: 207 B After Width: | Height: | Size: 207 B |
|
Before Width: | Height: | Size: 191 B After Width: | Height: | Size: 191 B |
|
Before Width: | Height: | Size: 214 B After Width: | Height: | Size: 214 B |
|
Before Width: | Height: | Size: 333 B After Width: | Height: | Size: 333 B |
|
Before Width: | Height: | Size: 357 B After Width: | Height: | Size: 357 B |
|
Before Width: | Height: | Size: 350 B After Width: | Height: | Size: 350 B |
|
Before Width: | Height: | Size: 257 B After Width: | Height: | Size: 257 B |
|
Before Width: | Height: | Size: 258 B After Width: | Height: | Size: 258 B |
|
Before Width: | Height: | Size: 818 B After Width: | Height: | Size: 818 B |
|
Before Width: | Height: | Size: 311 B After Width: | Height: | Size: 311 B |
BIN
setup/data/tools-src/icon_net.png
Normal file
|
After Width: | Height: | Size: 790 B |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 1.0 KiB |
BIN
setup/data/tools-src/logo_net.png
Normal file
|
After Width: | Height: | Size: 28 KiB |
|
Before Width: | Height: | Size: 276 B After Width: | Height: | Size: 276 B |
|
Before Width: | Height: | Size: 276 B After Width: | Height: | Size: 276 B |
|
Before Width: | Height: | Size: 211 B After Width: | Height: | Size: 211 B |
|
Before Width: | Height: | Size: 244 B After Width: | Height: | Size: 244 B |
|
Before Width: | Height: | Size: 263 B After Width: | Height: | Size: 263 B |
|
Before Width: | Height: | Size: 243 B After Width: | Height: | Size: 243 B |
|
Before Width: | Height: | Size: 237 B After Width: | Height: | Size: 237 B |
|
Before Width: | Height: | Size: 213 B After Width: | Height: | Size: 213 B |
|
Before Width: | Height: | Size: 210 B After Width: | Height: | Size: 210 B |
|
Before Width: | Height: | Size: 206 B After Width: | Height: | Size: 206 B |
|
Before Width: | Height: | Size: 290 B After Width: | Height: | Size: 290 B |
|
Before Width: | Height: | Size: 206 B After Width: | Height: | Size: 206 B |
|
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
|
Before Width: | Height: | Size: 226 B After Width: | Height: | Size: 226 B |
|
Before Width: | Height: | Size: 312 B After Width: | Height: | Size: 312 B |
|
Before Width: | Height: | Size: 213 B After Width: | Height: | Size: 213 B |
BIN
setup/data/tools-src/splash_net.png
Normal file
|
After Width: | Height: | Size: 120 KiB |
|
Before Width: | Height: | Size: 351 B After Width: | Height: | Size: 351 B |
|
Before Width: | Height: | Size: 284 B After Width: | Height: | Size: 284 B |
|
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 272 B |
|
Before Width: | Height: | Size: 275 B After Width: | Height: | Size: 275 B |
|
Before Width: | Height: | Size: 790 B After Width: | Height: | Size: 864 B |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 11 KiB |