Merge commit '0c0ed6c1a75ce05a91209fdf3ad8378a7b7e7f6a' into master-merge

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 6aa3e9f7bde6c5ad370bbd686a560b989daec6ec..69ae9652a83946ddb30e44316e78bfbee0361d36 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -2976,6 +2976,13 @@ ui::Window create_splash(){
        image.show();
        window.add(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 );
+       }
+
        window.dimensions(-1, -1);
        window.show();
 

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index 4068f27b551b7ebab1314e0361edb0d021ad5d3b..c2319f2348ff318f0c2bc4aa93d4fb2fed614264 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -2331,7 +2331,9 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
 
                TextureBrowser_createTreeViewTree();
 
-               gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( textureBrowser.m_scr_win_tree ), textureBrowser.m_treeViewTree  );
+               //gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( textureBrowser.m_scr_win_tree ), textureBrowser.m_treeViewTree  );
+               gtk_container_add( GTK_CONTAINER( textureBrowser.m_scr_win_tree ), GTK_WIDGET( textureBrowser.m_treeViewTree ) );
+
                textureBrowser.m_treeViewTree.show();
        }
        { // gl_widget scrollbar
@@ -2384,6 +2386,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
                }
                { // tag menu bar
                        auto menu_tags = ui::Menu(ui::New);
+                       gtk_menu_set_title( GTK_MENU( menu_tags ), "Tags" );
                        // auto tags_item = TextureBrowser_constructTagsMenu( menu_tags );
                        TextureBrowser_constructTagsMenu( menu_tags );
                        // gtk_menu_item_set_submenu( GTK_MENU_ITEM( tags_item ), menu_tags );
@@ -2392,6 +2395,9 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
                        auto button = toolbar_append_button( toolbar, "Tags", "texbro_tags.png" );
                        button.dimensions( 22, 22 );
                        button.connect( "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
                        textureBrowser.m_scr_win_tags = ui::ScrolledWindow(ui::New);
@@ -2405,7 +2411,9 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
             auto selection = gtk_tree_view_get_selection(textureBrowser.m_treeViewTags );
                        gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE );
 
-                       gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( textureBrowser.m_scr_win_tags ), textureBrowser.m_treeViewTags  );
+                       //gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( textureBrowser.m_scr_win_tags ), textureBrowser.m_treeViewTags  );
+                       gtk_container_add( GTK_CONTAINER( textureBrowser.m_scr_win_tags ), GTK_WIDGET( textureBrowser.m_treeViewTags ) );
+
                        textureBrowser.m_treeViewTags.show();
                }
                { // Texture/Tag notebook
@@ -2454,7 +2462,9 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
                        textureBrowser.m_assigned_tree.show();
 
                        scrolled_win.show();
-                       gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), textureBrowser.m_assigned_tree  );
+
+                       //gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), textureBrowser.m_assigned_tree  );
+                       gtk_container_add( GTK_CONTAINER( scrolled_win ), GTK_WIDGET( textureBrowser.m_available_tree ) );
 
                        frame_table.attach(scrolled_win, {0, 1, 1, 3}, {GTK_FILL, GTK_FILL});
                }
@@ -2482,7 +2492,9 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){
                        textureBrowser.m_available_tree.show();
 
                        scrolled_win.show();
-                       gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), textureBrowser.m_available_tree  );
+
+                       //gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), textureBrowser.m_available_tree  );
+                       gtk_container_add( GTK_CONTAINER( scrolled_win ), GTK_WIDGET( textureBrowser.m_available_tree ) );
 
                        frame_table.attach(scrolled_win, {2, 3, 1, 3}, {GTK_FILL, GTK_FILL});
                }

diff --git a/setup/data/tools-src/black.png b/setup/data/tools-src/black.png
new file mode 100644 (file)
index 0000000..6d3e454
Binary files /dev/null and b/setup/data/tools-src/black.png differ

diff --git a/setup/data/tools-src/brush_flipx.png b/setup/data/tools-src/brush_flipx.png
new file mode 100644 (file)
index 0000000..6207339
Binary files /dev/null and b/setup/data/tools-src/brush_flipx.png differ

diff --git a/setup/data/tools-src/brush_flipy.png b/setup/data/tools-src/brush_flipy.png
new file mode 100644 (file)
index 0000000..ce537f3
Binary files /dev/null and b/setup/data/tools-src/brush_flipy.png differ

diff --git a/setup/data/tools-src/brush_flipz.png b/setup/data/tools-src/brush_flipz.png
new file mode 100644 (file)
index 0000000..d2d0708
Binary files /dev/null and b/setup/data/tools-src/brush_flipz.png differ

diff --git a/setup/data/tools-src/brush_rotatex.png b/setup/data/tools-src/brush_rotatex.png
new file mode 100644 (file)
index 0000000..cd1e1a5
Binary files /dev/null and b/setup/data/tools-src/brush_rotatex.png differ

diff --git a/setup/data/tools-src/brush_rotatey.png b/setup/data/tools-src/brush_rotatey.png
new file mode 100644 (file)
index 0000000..907210e
Binary files /dev/null and b/setup/data/tools-src/brush_rotatey.png differ

diff --git a/setup/data/tools-src/brush_rotatez.png b/setup/data/tools-src/brush_rotatez.png
new file mode 100644 (file)
index 0000000..92edb04
Binary files /dev/null and b/setup/data/tools-src/brush_rotatez.png differ

diff --git a/setup/data/tools-src/dontselectcurve.png b/setup/data/tools-src/dontselectcurve.png
new file mode 100644 (file)
index 0000000..66254df
Binary files /dev/null and b/setup/data/tools-src/dontselectcurve.png differ

diff --git a/setup/data/tools-src/dontselectmodel.png b/setup/data/tools-src/dontselectmodel.png
new file mode 100644 (file)
index 0000000..82c472a
Binary files /dev/null and b/setup/data/tools-src/dontselectmodel.png differ

diff --git a/setup/data/tools-src/f-decals.png b/setup/data/tools-src/f-decals.png
new file mode 100644 (file)
index 0000000..a07fa5d
Binary files /dev/null and b/setup/data/tools-src/f-decals.png differ

diff --git a/setup/data/tools-src/f-invert.png b/setup/data/tools-src/f-invert.png
new file mode 100644 (file)
index 0000000..0b9f0f2
Binary files /dev/null and b/setup/data/tools-src/f-invert.png differ

diff --git a/setup/data/tools-src/garux/icon_garux.png b/setup/data/tools-src/garux/icon_garux.png
new file mode 100644 (file)
index 0000000..b0219e8
Binary files /dev/null and b/setup/data/tools-src/garux/icon_garux.png differ

diff --git a/setup/data/tools-src/garux/logo_garux.png b/setup/data/tools-src/garux/logo_garux.png
new file mode 100644 (file)
index 0000000..533933e
Binary files /dev/null and b/setup/data/tools-src/garux/logo_garux.png differ

diff --git a/setup/data/tools-src/garux/radiant_garux.ico b/setup/data/tools-src/garux/radiant_garux.ico
new file mode 100644 (file)
index 0000000..6492cb0
Binary files /dev/null and b/setup/data/tools-src/garux/radiant_garux.ico differ

diff --git a/setup/data/tools-src/garux/splash_garux.png b/setup/data/tools-src/garux/splash_garux.png
new file mode 100644 (file)
index 0000000..3e92376
Binary files /dev/null and b/setup/data/tools-src/garux/splash_garux.png differ

diff --git a/setup/data/tools-src/lightinspector.png b/setup/data/tools-src/lightinspector.png
new file mode 100644 (file)
index 0000000..93688b3
Binary files /dev/null and b/setup/data/tools-src/lightinspector.png differ

diff --git a/setup/data/tools-src/noFalloff.png b/setup/data/tools-src/noFalloff.png
new file mode 100644 (file)
index 0000000..55c6a80
Binary files /dev/null and b/setup/data/tools-src/noFalloff.png differ

diff --git a/setup/data/tools-src/patch_bend.png b/setup/data/tools-src/patch_bend.png
new file mode 100644 (file)
index 0000000..62eb756
Binary files /dev/null and b/setup/data/tools-src/patch_bend.png differ

diff --git a/setup/data/tools-src/patch_drilldown.png b/setup/data/tools-src/patch_drilldown.png
new file mode 100644 (file)
index 0000000..1794a13
Binary files /dev/null and b/setup/data/tools-src/patch_drilldown.png differ

diff --git a/setup/data/tools-src/patch_insdel.png b/setup/data/tools-src/patch_insdel.png
new file mode 100644 (file)
index 0000000..362285e
Binary files /dev/null and b/setup/data/tools-src/patch_insdel.png differ

diff --git a/setup/data/tools-src/patch_showboundingbox.png b/setup/data/tools-src/patch_showboundingbox.png
new file mode 100644 (file)
index 0000000..891f3c7
Binary files /dev/null and b/setup/data/tools-src/patch_showboundingbox.png differ

diff --git a/setup/data/tools-src/patch_weld.png b/setup/data/tools-src/patch_weld.png
new file mode 100644 (file)
index 0000000..3d53a6b
Binary files /dev/null and b/setup/data/tools-src/patch_weld.png differ

diff --git a/setup/data/tools-src/popup_selection.png b/setup/data/tools-src/popup_selection.png
new file mode 100644 (file)
index 0000000..217fa82
Binary files /dev/null and b/setup/data/tools-src/popup_selection.png differ

diff --git a/setup/data/tools-src/scalelockx.png b/setup/data/tools-src/scalelockx.png
new file mode 100644 (file)
index 0000000..9714120
Binary files /dev/null and b/setup/data/tools-src/scalelockx.png differ

diff --git a/setup/data/tools-src/scalelocky.png b/setup/data/tools-src/scalelocky.png
new file mode 100644 (file)
index 0000000..7836242
Binary files /dev/null and b/setup/data/tools-src/scalelocky.png differ

diff --git a/setup/data/tools-src/scalelockz.png b/setup/data/tools-src/scalelockz.png
new file mode 100644 (file)
index 0000000..f967680
Binary files /dev/null and b/setup/data/tools-src/scalelockz.png differ

diff --git a/setup/data/tools-src/selection_makehollow.png b/setup/data/tools-src/selection_makehollow.png
new file mode 100644 (file)
index 0000000..5842690
Binary files /dev/null and b/setup/data/tools-src/selection_makehollow.png differ

diff --git a/setup/data/tools-src/selection_selectcompletetall.png b/setup/data/tools-src/selection_selectcompletetall.png
new file mode 100644 (file)
index 0000000..3f5813e
Binary files /dev/null and b/setup/data/tools-src/selection_selectcompletetall.png differ

diff --git a/setup/data/tools-src/selection_selectcompletetall_old.png b/setup/data/tools-src/selection_selectcompletetall_old.png
new file mode 100644 (file)
index 0000000..3f55564
Binary files /dev/null and b/setup/data/tools-src/selection_selectcompletetall_old.png differ

diff --git a/setup/data/tools-src/selection_selectpartialtall.png b/setup/data/tools-src/selection_selectpartialtall.png
new file mode 100644 (file)
index 0000000..e378e47
Binary files /dev/null and b/setup/data/tools-src/selection_selectpartialtall.png differ

diff --git a/setup/data/tools-src/selection_selectpartialtall_old.png b/setup/data/tools-src/selection_selectpartialtall_old.png
new file mode 100644 (file)
index 0000000..ab1dfc7
Binary files /dev/null and b/setup/data/tools-src/selection_selectpartialtall_old.png differ

diff --git a/setup/data/tools-src/show_entities.png b/setup/data/tools-src/show_entities.png
new file mode 100644 (file)
index 0000000..97bc49b
Binary files /dev/null and b/setup/data/tools-src/show_entities.png differ

diff --git a/setup/data/tools-src/textures_popup.png b/setup/data/tools-src/textures_popup.png
new file mode 100644 (file)
index 0000000..b238679
Binary files /dev/null and b/setup/data/tools-src/textures_popup.png differ

diff --git a/setup/data/tools-src/view_cameratoggle.png b/setup/data/tools-src/view_cameratoggle.png
new file mode 100644 (file)
index 0000000..375e3de
Binary files /dev/null and b/setup/data/tools-src/view_cameratoggle.png differ

diff --git a/setup/data/tools-src/view_cameraupdate.png b/setup/data/tools-src/view_cameraupdate.png
new file mode 100644 (file)
index 0000000..62aa228
Binary files /dev/null and b/setup/data/tools-src/view_cameraupdate.png differ

diff --git a/setup/data/tools-src/white.png b/setup/data/tools-src/white.png
new file mode 100644 (file)
index 0000000..4af01bd
Binary files /dev/null and b/setup/data/tools-src/white.png differ

diff --git a/setup/data/tools/bitmaps/black.png b/setup/data/tools/bitmaps/black.png
deleted file mode 100644 (file)
index 6d3e454..0000000
Binary files a/setup/data/tools/bitmaps/black.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/brush_flipx.png b/setup/data/tools/bitmaps/brush_flipx.png
deleted file mode 100644 (file)
index 6207339..0000000
Binary files a/setup/data/tools/bitmaps/brush_flipx.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/brush_flipy.png b/setup/data/tools/bitmaps/brush_flipy.png
deleted file mode 100644 (file)
index ce537f3..0000000
Binary files a/setup/data/tools/bitmaps/brush_flipy.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/brush_flipz.png b/setup/data/tools/bitmaps/brush_flipz.png
deleted file mode 100644 (file)
index d2d0708..0000000
Binary files a/setup/data/tools/bitmaps/brush_flipz.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/brush_rotatex.png b/setup/data/tools/bitmaps/brush_rotatex.png
deleted file mode 100644 (file)
index cd1e1a5..0000000
Binary files a/setup/data/tools/bitmaps/brush_rotatex.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/brush_rotatey.png b/setup/data/tools/bitmaps/brush_rotatey.png
deleted file mode 100644 (file)
index 907210e..0000000
Binary files a/setup/data/tools/bitmaps/brush_rotatey.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/brush_rotatez.png b/setup/data/tools/bitmaps/brush_rotatez.png
deleted file mode 100644 (file)
index 92edb04..0000000
Binary files a/setup/data/tools/bitmaps/brush_rotatez.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/dontselectcurve.png b/setup/data/tools/bitmaps/dontselectcurve.png
deleted file mode 100644 (file)
index 66254df..0000000
Binary files a/setup/data/tools/bitmaps/dontselectcurve.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/dontselectmodel.png b/setup/data/tools/bitmaps/dontselectmodel.png
deleted file mode 100644 (file)
index 82c472a..0000000
Binary files a/setup/data/tools/bitmaps/dontselectmodel.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/f-decals.png b/setup/data/tools/bitmaps/f-decals.png
deleted file mode 100644 (file)
index a07fa5d..0000000
Binary files a/setup/data/tools/bitmaps/f-decals.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/f-invert.png b/setup/data/tools/bitmaps/f-invert.png
deleted file mode 100644 (file)
index 0b9f0f2..0000000
Binary files a/setup/data/tools/bitmaps/f-invert.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/lightinspector.png b/setup/data/tools/bitmaps/lightinspector.png
deleted file mode 100644 (file)
index 93688b3..0000000
Binary files a/setup/data/tools/bitmaps/lightinspector.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/noFalloff.png b/setup/data/tools/bitmaps/noFalloff.png
deleted file mode 100644 (file)
index 55c6a80..0000000
Binary files a/setup/data/tools/bitmaps/noFalloff.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/patch_bend.png b/setup/data/tools/bitmaps/patch_bend.png
deleted file mode 100644 (file)
index 62eb756..0000000
Binary files a/setup/data/tools/bitmaps/patch_bend.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/patch_drilldown.png b/setup/data/tools/bitmaps/patch_drilldown.png
deleted file mode 100644 (file)
index 1794a13..0000000
Binary files a/setup/data/tools/bitmaps/patch_drilldown.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/patch_insdel.png b/setup/data/tools/bitmaps/patch_insdel.png
deleted file mode 100644 (file)
index 362285e..0000000
Binary files a/setup/data/tools/bitmaps/patch_insdel.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/patch_showboundingbox.png b/setup/data/tools/bitmaps/patch_showboundingbox.png
deleted file mode 100644 (file)
index 891f3c7..0000000
Binary files a/setup/data/tools/bitmaps/patch_showboundingbox.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/patch_weld.png b/setup/data/tools/bitmaps/patch_weld.png
deleted file mode 100644 (file)
index 3d53a6b..0000000
Binary files a/setup/data/tools/bitmaps/patch_weld.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/popup_selection.png b/setup/data/tools/bitmaps/popup_selection.png
deleted file mode 100644 (file)
index 217fa82..0000000
Binary files a/setup/data/tools/bitmaps/popup_selection.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/scalelockx.png b/setup/data/tools/bitmaps/scalelockx.png
deleted file mode 100644 (file)
index 9714120..0000000
Binary files a/setup/data/tools/bitmaps/scalelockx.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/scalelocky.png b/setup/data/tools/bitmaps/scalelocky.png
deleted file mode 100644 (file)
index 7836242..0000000
Binary files a/setup/data/tools/bitmaps/scalelocky.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/scalelockz.png b/setup/data/tools/bitmaps/scalelockz.png
deleted file mode 100644 (file)
index f967680..0000000
Binary files a/setup/data/tools/bitmaps/scalelockz.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/selection_makehollow.png b/setup/data/tools/bitmaps/selection_makehollow.png
deleted file mode 100644 (file)
index 5842690..0000000
Binary files a/setup/data/tools/bitmaps/selection_makehollow.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall.png b/setup/data/tools/bitmaps/selection_selectcompletetall.png
deleted file mode 100644 (file)
index 3f5813e..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectcompletetall.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall_old.png b/setup/data/tools/bitmaps/selection_selectcompletetall_old.png
deleted file mode 100644 (file)
index 3f55564..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectcompletetall_old.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall.png b/setup/data/tools/bitmaps/selection_selectpartialtall.png
deleted file mode 100644 (file)
index e378e47..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectpartialtall.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall_old.png b/setup/data/tools/bitmaps/selection_selectpartialtall_old.png
deleted file mode 100644 (file)
index ab1dfc7..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectpartialtall_old.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/show_entities.png b/setup/data/tools/bitmaps/show_entities.png
deleted file mode 100644 (file)
index 97bc49b..0000000
Binary files a/setup/data/tools/bitmaps/show_entities.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/textures_popup.png b/setup/data/tools/bitmaps/textures_popup.png
deleted file mode 100644 (file)
index b238679..0000000
Binary files a/setup/data/tools/bitmaps/textures_popup.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/view_cameratoggle.png b/setup/data/tools/bitmaps/view_cameratoggle.png
deleted file mode 100644 (file)
index 375e3de..0000000
Binary files a/setup/data/tools/bitmaps/view_cameratoggle.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/view_cameraupdate.png b/setup/data/tools/bitmaps/view_cameraupdate.png
deleted file mode 100644 (file)
index 62aa228..0000000
Binary files a/setup/data/tools/bitmaps/view_cameraupdate.png and /dev/null differ

diff --git a/setup/data/tools/bitmaps/white.png b/setup/data/tools/bitmaps/white.png
deleted file mode 100644 (file)
index 4af01bd..0000000
Binary files a/setup/data/tools/bitmaps/white.png and /dev/null differ