diff --git a/install/bitmaps/logo.bmp b/install/bitmaps/logo.bmp deleted file mode 100644 index 759b87cb..00000000 Binary files a/install/bitmaps/logo.bmp and /dev/null differ diff --git a/install/bitmaps/logo.png b/install/bitmaps/logo.png index cfa570bd..b013c9b2 100644 Binary files a/install/bitmaps/logo.png and b/install/bitmaps/logo.png differ diff --git a/install/bitmaps/splash.bmp b/install/bitmaps/splash.bmp deleted file mode 100644 index f9e7cc1d..00000000 Binary files a/install/bitmaps/splash.bmp and /dev/null differ diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp index 885bfc2f..b80e7e3f 100644 --- a/radiant/gtkmisc.cpp +++ b/radiant/gtkmisc.cpp @@ -726,6 +726,24 @@ GtkWidget* new_pixmap( GtkWidget* widget, const char* filename ){ return pixmap; } +GtkWidget* new_image_icon(const char* filename) { + GError* gErr; + GdkPixbuf* iconPB; + + /* + iconPB = gdk_pixbuf_new_from_file(filename, &gErr); + + if(iconPB) + return gtk_image_new_from_pixbuf(iconPB); + else + return NULL; + */ + + CString str = g_strBitmapsPath; + str += filename; + return gtk_image_new_from_file(str); +} + // ============================================================================= // Menu stuff diff --git a/radiant/gtkmisc.h b/radiant/gtkmisc.h index 3c9c6b29..b939755a 100644 --- a/radiant/gtkmisc.h +++ b/radiant/gtkmisc.h @@ -61,6 +61,7 @@ gint widget_delete_hide( GtkWidget *widget ); bool WINAPI load_plugin_bitmap( const char* filename, void **gdkpixmap, void **mask ); void load_pixmap( const char* filename, GtkWidget* widget, GdkPixmap **gdkpixmap, GdkBitmap **mask ); GtkWidget* new_pixmap( GtkWidget* widget, const char* filename ); +GtkWidget* new_image_icon(const char* filename); GtkWidget* menu_separator( GtkWidget *menu ); GtkWidget* menu_tearoff( GtkWidget *menu ); diff --git a/radiant/main.cpp b/radiant/main.cpp index 19297d7f..1affc95e 100644 --- a/radiant/main.cpp +++ b/radiant/main.cpp @@ -71,8 +71,9 @@ int CALLBACK WinMain( #endif -// ============================================================================= -// Splash screen +//============================================================================ +// Splash Screen +//============================================================================ // get rid of it when debugging #if defined ( _DEBUG ) @@ -81,7 +82,8 @@ int CALLBACK WinMain( static GtkWidget *splash_screen; -// called based on a timer, or in particular cases when we don't want to keep it around +// called based on a timer, or in particular cases when we don't want to +// keep it around gint try_destroy_splash( gpointer data ){ if ( splash_screen ) { gtk_widget_destroy( splash_screen ); @@ -90,56 +92,23 @@ gint try_destroy_splash( gpointer data ){ return FALSE; } -static void create_splash(){ - GtkWidget *alert_frame, *alert_frame1, *pixmap; +static void create_splash() { + splash_screen = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_title(GTK_WINDOW(splash_screen), "Splash Screen"); + gtk_container_set_border_width(GTK_CONTAINER(splash_screen), 0); + gtk_widget_set_size_request(splash_screen, 640, 384); + gtk_window_set_keep_above(GTK_WINDOW(splash_screen), TRUE); + gtk_window_set_decorated(GTK_WINDOW(splash_screen), FALSE); + gtk_window_set_position(GTK_WINDOW(splash_screen), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(splash_screen), FALSE); - splash_screen = gtk_window_new( GTK_WINDOW_POPUP ); - gtk_window_position( GTK_WINDOW( splash_screen ), GTK_WIN_POS_CENTER ); - gtk_widget_realize( splash_screen ); + CString str = g_strBitmapsPath; + str += "splash.png"; + GtkWidget *image = gtk_image_new_from_file(str.GetBuffer()); + gtk_container_add(GTK_CONTAINER(splash_screen), image); + gtk_widget_show_all(splash_screen); - alert_frame1 = gtk_frame_new( NULL ); - gtk_widget_show( alert_frame1 ); - gtk_container_add( GTK_CONTAINER( splash_screen ), alert_frame1 ); - gtk_frame_set_shadow_type( GTK_FRAME( alert_frame1 ), GTK_SHADOW_OUT ); - - alert_frame = gtk_frame_new( NULL ); - gtk_widget_show( alert_frame ); - - gtk_container_add( GTK_CONTAINER( alert_frame1 ), alert_frame ); - gtk_frame_set_shadow_type( GTK_FRAME( alert_frame ), GTK_SHADOW_IN ); - gtk_container_border_width( GTK_CONTAINER( alert_frame ), 3 ); - - pixmap = gtk_preview_new( GTK_PREVIEW_COLOR ); - gtk_widget_show( pixmap ); - gtk_container_add( GTK_CONTAINER( alert_frame ), pixmap ); - - CString str; - guint16 width, height; - unsigned char *buf; - - str = g_strGameToolsPath; - str += "bitmaps/splash.bmp"; - - unsigned char* load_bitmap_file( const char* filename, guint16* width, guint16* height ); - buf = load_bitmap_file( str.GetBuffer(), &width, &height ); - - if ( !buf ) { - str = g_strBitmapsPath; - str += "splash.bmp"; - - buf = load_bitmap_file( str.GetBuffer(), &width, &height ); - } - - if ( buf ) { - GtkPreview *preview = GTK_PREVIEW( pixmap ); - gtk_preview_size( preview, width, height ); - for ( int y = 0; y < height; y++ ) - gtk_preview_draw_row( preview, buf + y * width * 3, 0, y, width ); - } - - gtk_widget_show_all( splash_screen ); - - while ( gtk_events_pending() ) + while(gtk_events_pending()) gtk_main_iteration(); } diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index f276bbda..ddf81510 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -1664,87 +1664,87 @@ void MainFrame::create_main_toolbar( GtkWidget *window, GtkWidget *vbox ){ gtk_widget_show( toolbar ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), _( "Open" ), _( "Open an existing map" ), "", - new_pixmap( window, "file_open.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("file_open.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_FILE_OPEN ) ); g_object_set_data( G_OBJECT( window ), "tb_file_open", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), _( "Save" ), _( "Save the active map" ), "", - new_pixmap( window, "file_save.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("file_save.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_FILE_SAVE ) ); g_object_set_data( G_OBJECT( window ), "tb_file_save", w ); gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "x-axis Flip" ), "", - new_pixmap( window, "brush_flipx.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("brush_flipx.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_BRUSH_FLIPX ) ); g_object_set_data( G_OBJECT( window ), "tb_brush_flipx", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "x-axis Rotate" ), "", - new_pixmap( window, "brush_rotatex.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("brush_rotatex.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_BRUSH_ROTATEX ) ); g_object_set_data( G_OBJECT( window ), "tb_brush_rotatex", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "y-axis Flip" ), "", - new_pixmap( window, "brush_flipy.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("brush_flipy.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_BRUSH_FLIPY ) ); g_object_set_data( G_OBJECT( window ), "tb_brush_flipy", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "y-axis Rotate" ), "", - new_pixmap( window, "brush_rotatey.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("brush_rotatey.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_BRUSH_ROTATEY ) ); g_object_set_data( G_OBJECT( window ), "tb_brush_rotatey", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "z-axis Flip" ), "", - new_pixmap( window, "brush_flipz.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("brush_flipz.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_BRUSH_FLIPZ ) ); g_object_set_data( G_OBJECT( window ), "tb_brush_flipz", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "z-axis Rotate" ), "", - new_pixmap( window, "brush_rotatez.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("brush_rotatez.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_BRUSH_ROTATEZ ) ); g_object_set_data( G_OBJECT( window ), "tb_brush_rotatez", w ); gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); if ( g_PrefsDlg.m_bWideToolbar ) { w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "Complete Tall" ), "", - new_pixmap( window, "selection_selectcompletetall.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("selection_selectcompletetall.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SELECTION_SELECTCOMPLETETALL ) ); g_object_set_data( G_OBJECT( window ), "tb_selection_selectcompletetall", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "Select Touching" ), "", - new_pixmap( window, "selection_selecttouching.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("selection_selecttouching.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SELECTION_SELECTTOUCHING ) ); g_object_set_data( G_OBJECT( window ), "tb_selection_selecttouching", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "Select Partial Tall" ), "", - new_pixmap( window, "selection_selectpartialtall.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("selection_selectpartialtall.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SELECTION_SELECTPARTIALTALL ) ); g_object_set_data( G_OBJECT( window ), "tb_selection_selectpartialtall", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "Select Inside" ), "", - new_pixmap( window, "selection_selectinside.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("selection_selectinside.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SELECTION_SELECTINSIDE ) ); g_object_set_data( G_OBJECT( window ), "tb_selection_selectinside", w ); } else { w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "Selection" ), "", - new_pixmap( window, "popup_selection.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("popup_selection.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_POPUP_SELECTION ) ); g_object_set_data( G_OBJECT( window ), "tb_popup_selection", w ); } gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "CSG Subtract" ), "", - new_pixmap( window, "selection_csgsubtract.bmp" ), + new_image_icon("selection_csgsubtract.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SELECTION_CSGSUBTRACT ) ); g_object_set_data( G_OBJECT( window ), "tb_selection_csgsubtract", w ); if ( g_PrefsDlg.m_bWideToolbar ) { w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "CSG Merge" ), "", - new_pixmap( window, "selection_csgmerge.bmp" ), + new_image_icon("selection_csgmerge.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SELECTION_CSGMERGE ) ); g_object_set_data( G_OBJECT( window ), "tb_selection_csgmerge", w ); } w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "Hollow" ), "", - new_pixmap( window, "selection_makehollow.bmp" ), + new_image_icon("selection_makehollow.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SELECTION_MAKEHOLLOW ) ); g_object_set_data( G_OBJECT( window ), "tb_selection_makehollow", w ); if ( g_PrefsDlg.m_bWideToolbar ) { w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", _( "Clipper" ), "", new_pixmap( window, "view_clipper.bmp" ), + "", _( "Clipper" ), "", new_image_icon("view_clipper.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_VIEW_CLIPPER ) ); g_object_set_data( G_OBJECT( window ), "tb_view_clipper", w ); } @@ -1752,7 +1752,7 @@ void MainFrame::create_main_toolbar( GtkWidget *window, GtkWidget *vbox ){ gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "Change views" ), "", - new_pixmap( window, "view_change.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("view_change.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_VIEW_CHANGE ) ); g_object_set_data( G_OBJECT( window ), "tb_view_change", w ); @@ -1761,14 +1761,14 @@ void MainFrame::create_main_toolbar( GtkWidget *window, GtkWidget *vbox ){ } w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "Texture view mode" ), "", - new_pixmap( window, "textures_popup.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("textures_popup.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_TEXTURES_POPUP ) ); g_object_set_data( G_OBJECT( window ), "tb_textures_popup", w ); if ( g_PrefsDlg.m_bWideToolbar ) { w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "", _( "Cubic clip the camera view" ), "", - new_pixmap( window, "view_cubicclipping.bmp" ), + new_image_icon("view_cubicclipping.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_VIEW_CUBICCLIPPING ) ); g_object_set_data( G_OBJECT( window ), "tb_view_cubicclipping", w ); } @@ -1777,50 +1777,50 @@ void MainFrame::create_main_toolbar( GtkWidget *window, GtkWidget *vbox ){ if ( !g_PrefsDlg.m_bWideToolbar ) { w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", _( "Camera preview" ), "", new_pixmap( window, "view_cameratoggle.bmp" ), + "", _( "Camera preview" ), "", new_image_icon("view_cameratoggle.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_VIEW_CAMERATOGGLE ) ); g_object_set_data( G_OBJECT( window ), "tb_view_cameratoggle", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", "Update Camera", "", - new_pixmap( window, "view_cameraupdate.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("view_cameraupdate.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_VIEW_CAMERAUPDATE ) ); g_object_set_data( G_OBJECT( window ), "tb_view_cameraupdate", w ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "", _( "Cubic clip the camera view" ), "", - new_pixmap( window, "view_cubicclipping.bmp" ), + new_image_icon("view_cubicclipping.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_VIEW_CUBICCLIPPING ) ); g_object_set_data( G_OBJECT( window ), "tb_view_cubicclipping", w ); gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", _( "Entity inspector" ), "", new_pixmap( window, "view_entity.bmp" ), + "", _( "Entity inspector" ), "", new_image_icon("view_entity.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_VIEW_ENTITY ) ); g_object_set_data( G_OBJECT( window ), "tb_view_entity", w ); gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", _( "Clipper" ), "", new_pixmap( window, "view_clipper.bmp" ), + "", _( "Clipper" ), "", new_image_icon("view_clipper.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_VIEW_CLIPPER ) ); g_object_set_data( G_OBJECT( window ), "tb_view_clipper", w ); gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); } w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", _( "Free Rotation" ), "", new_pixmap( window, "select_mouserotate.bmp" ), + "", _( "Free Rotation" ), "", new_image_icon("select_mouserotate.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SELECT_MOUSEROTATE ) ); g_object_set_data( G_OBJECT( window ), "tb_select_mouserotate", w ); gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", _( "Free Scaling" ), "", new_pixmap( window, "select_mousescale.bmp" ), + "", _( "Free Scaling" ), "", new_image_icon("select_mousescale.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SELECT_MOUSESCALE ) ); g_object_set_data( G_OBJECT( window ), "tb_select_mousescale", w ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", _( "Disable Scaling Along X" ), "", new_pixmap( window, "scalelockx.bmp" ), + "", _( "Disable Scaling Along X" ), "", new_image_icon("scalelockx.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SCALELOCKX ) ); g_object_set_data( G_OBJECT( window ), "tb_scalelockx", w ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", _( "Disable Scaling Along Y" ), "", new_pixmap( window, "scalelocky.bmp" ), + "", _( "Disable Scaling Along Y" ), "", new_image_icon("scalelocky.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SCALELOCKY ) ); g_object_set_data( G_OBJECT( window ), "tb_scalelocky", w ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, - "", _( "Disable Scaling Along Z" ), "", new_pixmap( window, "scalelockz.bmp" ), + "", _( "Disable Scaling Along Z" ), "", new_image_icon("scalelockz.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SCALELOCKZ ) ); g_object_set_data( G_OBJECT( window ), "tb_scalelockz", w ); @@ -1828,7 +1828,7 @@ void MainFrame::create_main_toolbar( GtkWidget *window, GtkWidget *vbox ){ gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "", _( "Don't select model brushes" ), "", - new_pixmap( window, "dontselectmodel.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("dontselectmodel.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_DONTSELECTMODEL ) ); gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); g_object_set_data( G_OBJECT( window ), "tb_dontselectmodel", w ); @@ -1836,7 +1836,7 @@ void MainFrame::create_main_toolbar( GtkWidget *window, GtkWidget *vbox ){ if ( !g_pGameDescription->mNoPatch ) { w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "", _( "Don't select curved brushes" ), "", - new_pixmap( window, "dontselectcurve.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("dontselectcurve.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_DONTSELECTCURVE ) ); g_object_set_data( G_OBJECT( window ), "tb_dontselectcurve", w ); } @@ -1846,31 +1846,31 @@ void MainFrame::create_main_toolbar( GtkWidget *window, GtkWidget *vbox ){ if ( g_PrefsDlg.m_bPatchToolbar ) { w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "", _( "Show patch bounding box" ), "", - new_pixmap( window, "patch_showboundingbox.bmp" ), + new_image_icon("patch_showboundingbox.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_PATCH_SHOWBOUNDINGBOX ) ); g_object_set_data( G_OBJECT( window ), "tb_patch_showboundingbox", w ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "", _( "Show patches as wireframes" ), "", - new_pixmap( window, "patch_wireframe.bmp" ), + new_image_icon("patch_wireframe.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_PATCH_WIREFRAME ) ); g_object_set_data( G_OBJECT( window ), "tb_patch_wireframe", w ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "", _( "Patch Bend mode" ), "", - new_pixmap( window, "patch_bend.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("patch_bend.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_PATCH_BEND ) ); g_object_set_data( G_OBJECT( window ), "tb_patch_bend", w ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "Put caps on the current patch" ), "", - new_pixmap( window, "curve_cap.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("curve_cap.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_CURVE_CAP ) ); g_object_set_data( G_OBJECT( window ), "tb_curve_cap", w ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "", _( "Welds equal patch points during moves" ), "", - new_pixmap( window, "patch_weld.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("patch_weld.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_PATCH_WELD ) ); g_object_set_data( G_OBJECT( window ), "tb_patch_weld", w ); w = gtk_toolbar_append_element( GTK_TOOLBAR( toolbar ), GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL, "", _( "Selects drill down rows and columns" ), "", - new_pixmap( window, "patch_drilldown.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("patch_drilldown.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_PATCH_DRILLDOWN ) ); g_object_set_data( G_OBJECT( window ), "tb_patch_drilldown", w ); } @@ -1878,7 +1878,7 @@ void MainFrame::create_main_toolbar( GtkWidget *window, GtkWidget *vbox ){ if ( g_PrefsDlg.m_bWideToolbar ) { gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) ); w = gtk_toolbar_append_item( GTK_TOOLBAR( toolbar ), "", _( "Show Entities as" ), "", - new_pixmap( window, "show_entities.bmp" ), GTK_SIGNAL_FUNC( HandleCommand ), + new_image_icon("show_entities.png"), GTK_SIGNAL_FUNC( HandleCommand ), GINT_TO_POINTER( ID_SHOW_ENTITIES ) ); g_object_set_data( G_OBJECT( window ), "tb_show_entities", w ); }