diff --git a/icons/radiant.ico b/icons/radiant.ico index d377f825..6492cb09 100644 Binary files a/icons/radiant.ico and b/icons/radiant.ico differ diff --git a/icons/radiant_net.ico b/icons/radiant_net.ico new file mode 100644 index 00000000..d377f825 Binary files /dev/null and b/icons/radiant_net.ico differ diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index d4473b40..32ee3f3e 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -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 ) ); } } } diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 8d07afe6..2f3db714 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -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 ) ); diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 819d4bc3..ef2ae005 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -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 ); } diff --git a/setup/data/tools/bitmaps/black.png b/setup/data/tools-src/black.png similarity index 100% rename from setup/data/tools/bitmaps/black.png rename to setup/data/tools-src/black.png diff --git a/setup/data/tools/bitmaps/brush_flipx.png b/setup/data/tools-src/brush_flipx.png similarity index 100% rename from setup/data/tools/bitmaps/brush_flipx.png rename to setup/data/tools-src/brush_flipx.png diff --git a/setup/data/tools/bitmaps/brush_flipy.png b/setup/data/tools-src/brush_flipy.png similarity index 100% rename from setup/data/tools/bitmaps/brush_flipy.png rename to setup/data/tools-src/brush_flipy.png diff --git a/setup/data/tools/bitmaps/brush_flipz.png b/setup/data/tools-src/brush_flipz.png similarity index 100% rename from setup/data/tools/bitmaps/brush_flipz.png rename to setup/data/tools-src/brush_flipz.png diff --git a/setup/data/tools/bitmaps/brush_rotatex.png b/setup/data/tools-src/brush_rotatex.png similarity index 100% rename from setup/data/tools/bitmaps/brush_rotatex.png rename to setup/data/tools-src/brush_rotatex.png diff --git a/setup/data/tools/bitmaps/brush_rotatey.png b/setup/data/tools-src/brush_rotatey.png similarity index 100% rename from setup/data/tools/bitmaps/brush_rotatey.png rename to setup/data/tools-src/brush_rotatey.png diff --git a/setup/data/tools/bitmaps/brush_rotatez.png b/setup/data/tools-src/brush_rotatez.png similarity index 100% rename from setup/data/tools/bitmaps/brush_rotatez.png rename to setup/data/tools-src/brush_rotatez.png diff --git a/setup/data/tools/bitmaps/dontselectcurve.png b/setup/data/tools-src/dontselectcurve.png similarity index 100% rename from setup/data/tools/bitmaps/dontselectcurve.png rename to setup/data/tools-src/dontselectcurve.png diff --git a/setup/data/tools/bitmaps/dontselectmodel.png b/setup/data/tools-src/dontselectmodel.png similarity index 100% rename from setup/data/tools/bitmaps/dontselectmodel.png rename to setup/data/tools-src/dontselectmodel.png diff --git a/setup/data/tools/bitmaps/f-decals.png b/setup/data/tools-src/f-decals.png similarity index 100% rename from setup/data/tools/bitmaps/f-decals.png rename to setup/data/tools-src/f-decals.png diff --git a/setup/data/tools/bitmaps/f-invert.png b/setup/data/tools-src/f-invert.png similarity index 100% rename from setup/data/tools/bitmaps/f-invert.png rename to setup/data/tools-src/f-invert.png diff --git a/setup/data/tools-src/icon_net.png b/setup/data/tools-src/icon_net.png new file mode 100644 index 00000000..15fcf029 Binary files /dev/null and b/setup/data/tools-src/icon_net.png differ diff --git a/setup/data/tools/bitmaps/lightinspector.png b/setup/data/tools-src/lightinspector.png similarity index 100% rename from setup/data/tools/bitmaps/lightinspector.png rename to setup/data/tools-src/lightinspector.png diff --git a/setup/data/tools-src/logo_net.png b/setup/data/tools-src/logo_net.png new file mode 100644 index 00000000..fd5afd4b Binary files /dev/null and b/setup/data/tools-src/logo_net.png differ diff --git a/setup/data/tools/bitmaps/noFalloff.png b/setup/data/tools-src/noFalloff.png similarity index 100% rename from setup/data/tools/bitmaps/noFalloff.png rename to setup/data/tools-src/noFalloff.png diff --git a/setup/data/tools/bitmaps/patch_bend.png b/setup/data/tools-src/patch_bend.png similarity index 100% rename from setup/data/tools/bitmaps/patch_bend.png rename to setup/data/tools-src/patch_bend.png diff --git a/setup/data/tools/bitmaps/patch_drilldown.png b/setup/data/tools-src/patch_drilldown.png similarity index 100% rename from setup/data/tools/bitmaps/patch_drilldown.png rename to setup/data/tools-src/patch_drilldown.png diff --git a/setup/data/tools/bitmaps/patch_insdel.png b/setup/data/tools-src/patch_insdel.png similarity index 100% rename from setup/data/tools/bitmaps/patch_insdel.png rename to setup/data/tools-src/patch_insdel.png diff --git a/setup/data/tools/bitmaps/patch_showboundingbox.png b/setup/data/tools-src/patch_showboundingbox.png similarity index 100% rename from setup/data/tools/bitmaps/patch_showboundingbox.png rename to setup/data/tools-src/patch_showboundingbox.png diff --git a/setup/data/tools/bitmaps/patch_weld.png b/setup/data/tools-src/patch_weld.png similarity index 100% rename from setup/data/tools/bitmaps/patch_weld.png rename to setup/data/tools-src/patch_weld.png diff --git a/setup/data/tools/bitmaps/popup_selection.png b/setup/data/tools-src/popup_selection.png similarity index 100% rename from setup/data/tools/bitmaps/popup_selection.png rename to setup/data/tools-src/popup_selection.png diff --git a/setup/data/tools/bitmaps/scalelockx.png b/setup/data/tools-src/scalelockx.png similarity index 100% rename from setup/data/tools/bitmaps/scalelockx.png rename to setup/data/tools-src/scalelockx.png diff --git a/setup/data/tools/bitmaps/scalelocky.png b/setup/data/tools-src/scalelocky.png similarity index 100% rename from setup/data/tools/bitmaps/scalelocky.png rename to setup/data/tools-src/scalelocky.png diff --git a/setup/data/tools/bitmaps/scalelockz.png b/setup/data/tools-src/scalelockz.png similarity index 100% rename from setup/data/tools/bitmaps/scalelockz.png rename to setup/data/tools-src/scalelockz.png diff --git a/setup/data/tools/bitmaps/selection_makehollow.png b/setup/data/tools-src/selection_makehollow.png similarity index 100% rename from setup/data/tools/bitmaps/selection_makehollow.png rename to setup/data/tools-src/selection_makehollow.png diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall.png b/setup/data/tools-src/selection_selectcompletetall.png similarity index 100% rename from setup/data/tools/bitmaps/selection_selectcompletetall.png rename to setup/data/tools-src/selection_selectcompletetall.png diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall_old.png b/setup/data/tools-src/selection_selectcompletetall_old.png similarity index 100% rename from setup/data/tools/bitmaps/selection_selectcompletetall_old.png rename to setup/data/tools-src/selection_selectcompletetall_old.png diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall.png b/setup/data/tools-src/selection_selectpartialtall.png similarity index 100% rename from setup/data/tools/bitmaps/selection_selectpartialtall.png rename to setup/data/tools-src/selection_selectpartialtall.png diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall_old.png b/setup/data/tools-src/selection_selectpartialtall_old.png similarity index 100% rename from setup/data/tools/bitmaps/selection_selectpartialtall_old.png rename to setup/data/tools-src/selection_selectpartialtall_old.png diff --git a/setup/data/tools/bitmaps/show_entities.png b/setup/data/tools-src/show_entities.png similarity index 100% rename from setup/data/tools/bitmaps/show_entities.png rename to setup/data/tools-src/show_entities.png diff --git a/setup/data/tools-src/splash_net.png b/setup/data/tools-src/splash_net.png new file mode 100644 index 00000000..af09ccd8 Binary files /dev/null and b/setup/data/tools-src/splash_net.png differ diff --git a/setup/data/tools/bitmaps/textures_popup.png b/setup/data/tools-src/textures_popup.png similarity index 100% rename from setup/data/tools/bitmaps/textures_popup.png rename to setup/data/tools-src/textures_popup.png diff --git a/setup/data/tools/bitmaps/view_cameratoggle.png b/setup/data/tools-src/view_cameratoggle.png similarity index 100% rename from setup/data/tools/bitmaps/view_cameratoggle.png rename to setup/data/tools-src/view_cameratoggle.png diff --git a/setup/data/tools/bitmaps/view_cameraupdate.png b/setup/data/tools-src/view_cameraupdate.png similarity index 100% rename from setup/data/tools/bitmaps/view_cameraupdate.png rename to setup/data/tools-src/view_cameraupdate.png diff --git a/setup/data/tools/bitmaps/white.png b/setup/data/tools-src/white.png similarity index 100% rename from setup/data/tools/bitmaps/white.png rename to setup/data/tools-src/white.png diff --git a/setup/data/tools/bitmaps/icon.png b/setup/data/tools/bitmaps/icon.png index 15fcf029..b0219e8e 100644 Binary files a/setup/data/tools/bitmaps/icon.png and b/setup/data/tools/bitmaps/icon.png differ diff --git a/setup/data/tools/bitmaps/logo.png b/setup/data/tools/bitmaps/logo.png index fd5afd4b..533933e5 100644 Binary files a/setup/data/tools/bitmaps/logo.png and b/setup/data/tools/bitmaps/logo.png differ diff --git a/setup/data/tools/bitmaps/splash.png b/setup/data/tools/bitmaps/splash.png index af09ccd8..3e92376f 100644 Binary files a/setup/data/tools/bitmaps/splash.png and b/setup/data/tools/bitmaps/splash.png differ