diff --git a/install/bitmaps/brush_flipx.bmp b/install/bitmaps/brush_flipx.bmp deleted file mode 100644 index 91f3d669..00000000 Binary files a/install/bitmaps/brush_flipx.bmp and /dev/null differ diff --git a/install/bitmaps/brush_flipx.png b/install/bitmaps/brush_flipx.png new file mode 100644 index 00000000..39a98da3 Binary files /dev/null and b/install/bitmaps/brush_flipx.png differ diff --git a/install/bitmaps/brush_flipy.bmp b/install/bitmaps/brush_flipy.bmp deleted file mode 100644 index 0f8e65c6..00000000 Binary files a/install/bitmaps/brush_flipy.bmp and /dev/null differ diff --git a/install/bitmaps/brush_flipy.png b/install/bitmaps/brush_flipy.png new file mode 100644 index 00000000..e58e2284 Binary files /dev/null and b/install/bitmaps/brush_flipy.png differ diff --git a/install/bitmaps/brush_flipz.bmp b/install/bitmaps/brush_flipz.bmp deleted file mode 100644 index 38c20ff2..00000000 Binary files a/install/bitmaps/brush_flipz.bmp and /dev/null differ diff --git a/install/bitmaps/brush_flipz.png b/install/bitmaps/brush_flipz.png new file mode 100644 index 00000000..eb120e73 Binary files /dev/null and b/install/bitmaps/brush_flipz.png differ diff --git a/install/bitmaps/brush_rotatex.bmp b/install/bitmaps/brush_rotatex.bmp deleted file mode 100644 index b079071e..00000000 Binary files a/install/bitmaps/brush_rotatex.bmp and /dev/null differ diff --git a/install/bitmaps/brush_rotatex.png b/install/bitmaps/brush_rotatex.png new file mode 100644 index 00000000..cfdbbd22 Binary files /dev/null and b/install/bitmaps/brush_rotatex.png differ diff --git a/install/bitmaps/brush_rotatey.bmp b/install/bitmaps/brush_rotatey.bmp deleted file mode 100644 index efcfec24..00000000 Binary files a/install/bitmaps/brush_rotatey.bmp and /dev/null differ diff --git a/install/bitmaps/brush_rotatey.png b/install/bitmaps/brush_rotatey.png new file mode 100644 index 00000000..e8ead705 Binary files /dev/null and b/install/bitmaps/brush_rotatey.png differ diff --git a/install/bitmaps/brush_rotatez.bmp b/install/bitmaps/brush_rotatez.bmp deleted file mode 100644 index fcea0814..00000000 Binary files a/install/bitmaps/brush_rotatez.bmp and /dev/null differ diff --git a/install/bitmaps/brush_rotatez.png b/install/bitmaps/brush_rotatez.png new file mode 100644 index 00000000..a849fbfd Binary files /dev/null and b/install/bitmaps/brush_rotatez.png differ diff --git a/install/bitmaps/cap_bevel.bmp b/install/bitmaps/cap_bevel.bmp deleted file mode 100644 index 0de32442..00000000 Binary files a/install/bitmaps/cap_bevel.bmp and /dev/null differ diff --git a/install/bitmaps/cap_bevel.png b/install/bitmaps/cap_bevel.png new file mode 100644 index 00000000..d190d1c9 Binary files /dev/null and b/install/bitmaps/cap_bevel.png differ diff --git a/install/bitmaps/cap_endcap.bmp b/install/bitmaps/cap_endcap.bmp deleted file mode 100644 index 8e6c7f2a..00000000 Binary files a/install/bitmaps/cap_endcap.bmp and /dev/null differ diff --git a/install/bitmaps/cap_endcap.png b/install/bitmaps/cap_endcap.png new file mode 100644 index 00000000..45e5c0d7 Binary files /dev/null and b/install/bitmaps/cap_endcap.png differ diff --git a/install/bitmaps/cap_ibevel.bmp b/install/bitmaps/cap_ibevel.bmp deleted file mode 100644 index ccab98da..00000000 Binary files a/install/bitmaps/cap_ibevel.bmp and /dev/null differ diff --git a/install/bitmaps/cap_ibevel.png b/install/bitmaps/cap_ibevel.png new file mode 100644 index 00000000..cd84c785 Binary files /dev/null and b/install/bitmaps/cap_ibevel.png differ diff --git a/install/bitmaps/cap_iendcap.bmp b/install/bitmaps/cap_iendcap.bmp deleted file mode 100644 index 9640c9ae..00000000 Binary files a/install/bitmaps/cap_iendcap.bmp and /dev/null differ diff --git a/install/bitmaps/cap_iendcap.png b/install/bitmaps/cap_iendcap.png new file mode 100644 index 00000000..bbc013c6 Binary files /dev/null and b/install/bitmaps/cap_iendcap.png differ diff --git a/install/bitmaps/curve_cap.bmp b/install/bitmaps/curve_cap.bmp deleted file mode 100644 index e9d00a21..00000000 Binary files a/install/bitmaps/curve_cap.bmp and /dev/null differ diff --git a/install/bitmaps/curve_cap.png b/install/bitmaps/curve_cap.png new file mode 100644 index 00000000..52ff4fdc Binary files /dev/null and b/install/bitmaps/curve_cap.png differ diff --git a/install/bitmaps/dontselectcurve.bmp b/install/bitmaps/dontselectcurve.bmp deleted file mode 100644 index a7b97954..00000000 Binary files a/install/bitmaps/dontselectcurve.bmp and /dev/null differ diff --git a/install/bitmaps/dontselectcurve.png b/install/bitmaps/dontselectcurve.png new file mode 100644 index 00000000..7c4373d7 Binary files /dev/null and b/install/bitmaps/dontselectcurve.png differ diff --git a/install/bitmaps/dontselectmodel.bmp b/install/bitmaps/dontselectmodel.bmp deleted file mode 100644 index e81b1189..00000000 Binary files a/install/bitmaps/dontselectmodel.bmp and /dev/null differ diff --git a/install/bitmaps/dontselectmodel.png b/install/bitmaps/dontselectmodel.png new file mode 100644 index 00000000..510e5cda Binary files /dev/null and b/install/bitmaps/dontselectmodel.png differ diff --git a/install/bitmaps/file_open.bmp b/install/bitmaps/file_open.bmp deleted file mode 100644 index 1f1770c3..00000000 Binary files a/install/bitmaps/file_open.bmp and /dev/null differ diff --git a/install/bitmaps/file_open.png b/install/bitmaps/file_open.png new file mode 100644 index 00000000..db1fb7bf Binary files /dev/null and b/install/bitmaps/file_open.png differ diff --git a/install/bitmaps/file_save.bmp b/install/bitmaps/file_save.bmp deleted file mode 100644 index 651afb68..00000000 Binary files a/install/bitmaps/file_save.bmp and /dev/null differ diff --git a/install/bitmaps/file_save.png b/install/bitmaps/file_save.png new file mode 100644 index 00000000..e1a1af8e Binary files /dev/null and b/install/bitmaps/file_save.png differ diff --git a/install/bitmaps/icon.bmp b/install/bitmaps/icon.bmp deleted file mode 100644 index 4224da83..00000000 Binary files a/install/bitmaps/icon.bmp and /dev/null differ diff --git a/install/bitmaps/icon.png b/install/bitmaps/icon.png new file mode 100644 index 00000000..b42e1c9a Binary files /dev/null and b/install/bitmaps/icon.png differ 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/patch_bend.bmp b/install/bitmaps/patch_bend.bmp deleted file mode 100644 index af4fc94c..00000000 Binary files a/install/bitmaps/patch_bend.bmp and /dev/null differ diff --git a/install/bitmaps/patch_bend.png b/install/bitmaps/patch_bend.png new file mode 100644 index 00000000..36b055ca Binary files /dev/null and b/install/bitmaps/patch_bend.png differ diff --git a/install/bitmaps/patch_drilldown.bmp b/install/bitmaps/patch_drilldown.bmp deleted file mode 100644 index 01ebcf39..00000000 Binary files a/install/bitmaps/patch_drilldown.bmp and /dev/null differ diff --git a/install/bitmaps/patch_drilldown.png b/install/bitmaps/patch_drilldown.png new file mode 100644 index 00000000..cdb6458b Binary files /dev/null and b/install/bitmaps/patch_drilldown.png differ diff --git a/install/bitmaps/patch_insdel.bmp b/install/bitmaps/patch_insdel.bmp deleted file mode 100644 index b60b76b0..00000000 Binary files a/install/bitmaps/patch_insdel.bmp and /dev/null differ diff --git a/install/bitmaps/patch_insdel.png b/install/bitmaps/patch_insdel.png new file mode 100644 index 00000000..bd104d69 Binary files /dev/null and b/install/bitmaps/patch_insdel.png differ diff --git a/install/bitmaps/patch_showboundingbox.bmp b/install/bitmaps/patch_showboundingbox.bmp deleted file mode 100644 index 357cfaf1..00000000 Binary files a/install/bitmaps/patch_showboundingbox.bmp and /dev/null differ diff --git a/install/bitmaps/patch_showboundingbox.png b/install/bitmaps/patch_showboundingbox.png new file mode 100644 index 00000000..f4a05cc9 Binary files /dev/null and b/install/bitmaps/patch_showboundingbox.png differ diff --git a/install/bitmaps/patch_weld.bmp b/install/bitmaps/patch_weld.bmp deleted file mode 100644 index a0c99730..00000000 Binary files a/install/bitmaps/patch_weld.bmp and /dev/null differ diff --git a/install/bitmaps/patch_weld.png b/install/bitmaps/patch_weld.png new file mode 100644 index 00000000..d0319d78 Binary files /dev/null and b/install/bitmaps/patch_weld.png differ diff --git a/install/bitmaps/patch_wireframe.bmp b/install/bitmaps/patch_wireframe.bmp deleted file mode 100644 index 9804274f..00000000 Binary files a/install/bitmaps/patch_wireframe.bmp and /dev/null differ diff --git a/install/bitmaps/patch_wireframe.png b/install/bitmaps/patch_wireframe.png new file mode 100644 index 00000000..fc805599 Binary files /dev/null and b/install/bitmaps/patch_wireframe.png differ diff --git a/install/bitmaps/popup_selection.bmp b/install/bitmaps/popup_selection.bmp deleted file mode 100644 index 676c4d98..00000000 Binary files a/install/bitmaps/popup_selection.bmp and /dev/null differ diff --git a/install/bitmaps/popup_selection.png b/install/bitmaps/popup_selection.png new file mode 100644 index 00000000..2c5aaa40 Binary files /dev/null and b/install/bitmaps/popup_selection.png differ diff --git a/install/bitmaps/scalelockx.bmp b/install/bitmaps/scalelockx.bmp deleted file mode 100644 index 61363da2..00000000 Binary files a/install/bitmaps/scalelockx.bmp and /dev/null differ diff --git a/install/bitmaps/scalelockx.png b/install/bitmaps/scalelockx.png new file mode 100644 index 00000000..2b47f1bb Binary files /dev/null and b/install/bitmaps/scalelockx.png differ diff --git a/install/bitmaps/scalelocky.bmp b/install/bitmaps/scalelocky.bmp deleted file mode 100644 index 812394db..00000000 Binary files a/install/bitmaps/scalelocky.bmp and /dev/null differ diff --git a/install/bitmaps/scalelocky.png b/install/bitmaps/scalelocky.png new file mode 100644 index 00000000..50d1965e Binary files /dev/null and b/install/bitmaps/scalelocky.png differ diff --git a/install/bitmaps/scalelockz.bmp b/install/bitmaps/scalelockz.bmp deleted file mode 100644 index 5692e4a7..00000000 Binary files a/install/bitmaps/scalelockz.bmp and /dev/null differ diff --git a/install/bitmaps/scalelockz.png b/install/bitmaps/scalelockz.png new file mode 100644 index 00000000..c469b7fc Binary files /dev/null and b/install/bitmaps/scalelockz.png differ diff --git a/install/bitmaps/select_mouserotate.bmp b/install/bitmaps/select_mouserotate.bmp deleted file mode 100644 index 0139fd55..00000000 Binary files a/install/bitmaps/select_mouserotate.bmp and /dev/null differ diff --git a/install/bitmaps/select_mouserotate.png b/install/bitmaps/select_mouserotate.png new file mode 100644 index 00000000..3d40c4e0 Binary files /dev/null and b/install/bitmaps/select_mouserotate.png differ diff --git a/install/bitmaps/select_mousescale.bmp b/install/bitmaps/select_mousescale.bmp deleted file mode 100644 index 7cac2881..00000000 Binary files a/install/bitmaps/select_mousescale.bmp and /dev/null differ diff --git a/install/bitmaps/select_mousescale.png b/install/bitmaps/select_mousescale.png new file mode 100644 index 00000000..c65b9c8c Binary files /dev/null and b/install/bitmaps/select_mousescale.png differ diff --git a/install/bitmaps/selection_csgmerge.bmp b/install/bitmaps/selection_csgmerge.bmp deleted file mode 100644 index a77eba14..00000000 Binary files a/install/bitmaps/selection_csgmerge.bmp and /dev/null differ diff --git a/install/bitmaps/selection_csgmerge.png b/install/bitmaps/selection_csgmerge.png new file mode 100644 index 00000000..52f88d75 Binary files /dev/null and b/install/bitmaps/selection_csgmerge.png differ diff --git a/install/bitmaps/selection_csgsubtract.bmp b/install/bitmaps/selection_csgsubtract.bmp deleted file mode 100644 index 902f32f5..00000000 Binary files a/install/bitmaps/selection_csgsubtract.bmp and /dev/null differ diff --git a/install/bitmaps/selection_csgsubtract.png b/install/bitmaps/selection_csgsubtract.png new file mode 100644 index 00000000..b010f874 Binary files /dev/null and b/install/bitmaps/selection_csgsubtract.png differ diff --git a/install/bitmaps/selection_makehollow.bmp b/install/bitmaps/selection_makehollow.bmp deleted file mode 100644 index 1b62f223..00000000 Binary files a/install/bitmaps/selection_makehollow.bmp and /dev/null differ diff --git a/install/bitmaps/selection_makehollow.png b/install/bitmaps/selection_makehollow.png new file mode 100644 index 00000000..b58b73cb Binary files /dev/null and b/install/bitmaps/selection_makehollow.png differ diff --git a/install/bitmaps/selection_selectcompletetall.bmp b/install/bitmaps/selection_selectcompletetall.bmp deleted file mode 100644 index 1f911e8c..00000000 Binary files a/install/bitmaps/selection_selectcompletetall.bmp and /dev/null differ diff --git a/install/bitmaps/selection_selectcompletetall.png b/install/bitmaps/selection_selectcompletetall.png new file mode 100644 index 00000000..7c499175 Binary files /dev/null and b/install/bitmaps/selection_selectcompletetall.png differ diff --git a/install/bitmaps/selection_selectinside.bmp b/install/bitmaps/selection_selectinside.bmp deleted file mode 100644 index 5670d3ad..00000000 Binary files a/install/bitmaps/selection_selectinside.bmp and /dev/null differ diff --git a/install/bitmaps/selection_selectinside.png b/install/bitmaps/selection_selectinside.png new file mode 100644 index 00000000..eadd586d Binary files /dev/null and b/install/bitmaps/selection_selectinside.png differ diff --git a/install/bitmaps/selection_selectpartialtall.bmp b/install/bitmaps/selection_selectpartialtall.bmp deleted file mode 100644 index 77b418be..00000000 Binary files a/install/bitmaps/selection_selectpartialtall.bmp and /dev/null differ diff --git a/install/bitmaps/selection_selectpartialtall.png b/install/bitmaps/selection_selectpartialtall.png new file mode 100644 index 00000000..d51ea3b1 Binary files /dev/null and b/install/bitmaps/selection_selectpartialtall.png differ diff --git a/install/bitmaps/selection_selecttouching.bmp b/install/bitmaps/selection_selecttouching.bmp deleted file mode 100644 index 9a60815d..00000000 Binary files a/install/bitmaps/selection_selecttouching.bmp and /dev/null differ diff --git a/install/bitmaps/selection_selecttouching.png b/install/bitmaps/selection_selecttouching.png new file mode 100644 index 00000000..e12e1cf0 Binary files /dev/null and b/install/bitmaps/selection_selecttouching.png differ diff --git a/install/bitmaps/show_entities.bmp b/install/bitmaps/show_entities.bmp deleted file mode 100644 index 9188bee6..00000000 Binary files a/install/bitmaps/show_entities.bmp and /dev/null differ diff --git a/install/bitmaps/show_entities.png b/install/bitmaps/show_entities.png new file mode 100644 index 00000000..d094bf26 Binary files /dev/null and b/install/bitmaps/show_entities.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/install/bitmaps/splash.png b/install/bitmaps/splash.png new file mode 100644 index 00000000..9ccfb6b6 Binary files /dev/null and b/install/bitmaps/splash.png differ diff --git a/install/bitmaps/textures_popup.bmp b/install/bitmaps/textures_popup.bmp deleted file mode 100644 index 5333382f..00000000 Binary files a/install/bitmaps/textures_popup.bmp and /dev/null differ diff --git a/install/bitmaps/textures_popup.png b/install/bitmaps/textures_popup.png new file mode 100644 index 00000000..48ab4019 Binary files /dev/null and b/install/bitmaps/textures_popup.png differ diff --git a/install/bitmaps/view_cameratoggle.bmp b/install/bitmaps/view_cameratoggle.bmp deleted file mode 100644 index 4ec79ed6..00000000 Binary files a/install/bitmaps/view_cameratoggle.bmp and /dev/null differ diff --git a/install/bitmaps/view_cameratoggle.png b/install/bitmaps/view_cameratoggle.png new file mode 100644 index 00000000..94ac8266 Binary files /dev/null and b/install/bitmaps/view_cameratoggle.png differ diff --git a/install/bitmaps/view_cameraupdate.bmp b/install/bitmaps/view_cameraupdate.bmp deleted file mode 100644 index dbb11956..00000000 Binary files a/install/bitmaps/view_cameraupdate.bmp and /dev/null differ diff --git a/install/bitmaps/view_cameraupdate.png b/install/bitmaps/view_cameraupdate.png new file mode 100644 index 00000000..737b2cfb Binary files /dev/null and b/install/bitmaps/view_cameraupdate.png differ diff --git a/install/bitmaps/view_change.bmp b/install/bitmaps/view_change.bmp deleted file mode 100644 index 31b609e5..00000000 Binary files a/install/bitmaps/view_change.bmp and /dev/null differ diff --git a/install/bitmaps/view_change.png b/install/bitmaps/view_change.png new file mode 100644 index 00000000..c13f4679 Binary files /dev/null and b/install/bitmaps/view_change.png differ diff --git a/install/bitmaps/view_clipper.bmp b/install/bitmaps/view_clipper.bmp deleted file mode 100644 index 4ef20566..00000000 Binary files a/install/bitmaps/view_clipper.bmp and /dev/null differ diff --git a/install/bitmaps/view_clipper.png b/install/bitmaps/view_clipper.png new file mode 100644 index 00000000..70b3753f Binary files /dev/null and b/install/bitmaps/view_clipper.png differ diff --git a/install/bitmaps/view_cubicclipping.bmp b/install/bitmaps/view_cubicclipping.bmp deleted file mode 100644 index 7c6d23c1..00000000 Binary files a/install/bitmaps/view_cubicclipping.bmp and /dev/null differ diff --git a/install/bitmaps/view_cubicclipping.png b/install/bitmaps/view_cubicclipping.png new file mode 100644 index 00000000..0f846a84 Binary files /dev/null and b/install/bitmaps/view_cubicclipping.png differ diff --git a/install/bitmaps/view_entity.bmp b/install/bitmaps/view_entity.bmp deleted file mode 100644 index 851ec2c3..00000000 Binary files a/install/bitmaps/view_entity.bmp and /dev/null differ diff --git a/install/bitmaps/view_entity.png b/install/bitmaps/view_entity.png new file mode 100644 index 00000000..c6a51841 Binary files /dev/null and b/install/bitmaps/view_entity.png differ diff --git a/install/bitmaps/window1.bmp b/install/bitmaps/window1.bmp deleted file mode 100644 index f308f6ef..00000000 Binary files a/install/bitmaps/window1.bmp and /dev/null differ diff --git a/install/bitmaps/window1.png b/install/bitmaps/window1.png new file mode 100644 index 00000000..1301d0ad Binary files /dev/null and b/install/bitmaps/window1.png differ diff --git a/install/bitmaps/window2.bmp b/install/bitmaps/window2.bmp deleted file mode 100644 index b98b8691..00000000 Binary files a/install/bitmaps/window2.bmp and /dev/null differ diff --git a/install/bitmaps/window2.png b/install/bitmaps/window2.png new file mode 100644 index 00000000..8bd1092f Binary files /dev/null and b/install/bitmaps/window2.png differ diff --git a/install/bitmaps/window3.bmp b/install/bitmaps/window3.bmp deleted file mode 100644 index 2ea6feb8..00000000 Binary files a/install/bitmaps/window3.bmp and /dev/null differ diff --git a/install/bitmaps/window3.png b/install/bitmaps/window3.png new file mode 100644 index 00000000..a389dc15 Binary files /dev/null and b/install/bitmaps/window3.png differ diff --git a/install/bitmaps/window4.bmp b/install/bitmaps/window4.bmp deleted file mode 100644 index 5b9df336..00000000 Binary files a/install/bitmaps/window4.bmp and /dev/null differ diff --git a/install/bitmaps/window4.png b/install/bitmaps/window4.png new file mode 100644 index 00000000..4001e0ee Binary files /dev/null and b/install/bitmaps/window4.png differ diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index eeeab109..d03daa35 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -2962,25 +2962,25 @@ int DoCapDlg( int *type, bool *b_GroupResult ){ gtk_table_set_row_spacings( GTK_TABLE( table ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); - pixmap = new_pixmap( g_pParentWnd->m_pWidget, "cap_bevel.bmp" ); + pixmap = new_image_icon("cap_bevel.png"); gtk_widget_show( pixmap ); gtk_table_attach( GTK_TABLE( table ), pixmap, 0, 1, 0, 1, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - pixmap = new_pixmap( g_pParentWnd->m_pWidget, "cap_endcap.bmp" ); + pixmap = new_image_icon("cap_endcap.png"); gtk_widget_show( pixmap ); gtk_table_attach( GTK_TABLE( table ), pixmap, 0, 1, 1, 2, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - pixmap = new_pixmap( g_pParentWnd->m_pWidget, "cap_ibevel.bmp" ); + pixmap = new_image_icon("cap_ibevel.png"); gtk_widget_show( pixmap ); gtk_table_attach( GTK_TABLE( table ), pixmap, 0, 1, 2, 3, (GtkAttachOptions) ( GTK_FILL ), (GtkAttachOptions) ( 0 ), 0, 0 ); - pixmap = new_pixmap( g_pParentWnd->m_pWidget, "cap_iendcap.bmp" ); + pixmap = new_image_icon("cap_iendcap.png"); gtk_widget_show( pixmap ); gtk_table_attach( GTK_TABLE( table ), pixmap, 0, 1, 3, 4, (GtkAttachOptions) ( GTK_FILL ), diff --git a/radiant/gtkmisc.cpp b/radiant/gtkmisc.cpp index 885bfc2f..352acac9 100644 --- a/radiant/gtkmisc.cpp +++ b/radiant/gtkmisc.cpp @@ -726,6 +726,12 @@ GtkWidget* new_pixmap( GtkWidget* widget, const char* filename ){ return pixmap; } +GtkWidget* new_image_icon(const char* filename) { + 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 ); } diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp index a8bc384d..c3021346 100644 --- a/radiant/preferences.cpp +++ b/radiant/preferences.cpp @@ -2083,28 +2083,28 @@ void PrefsDlg::BuildDialog(){ gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); // view type 1 - pixmap = new_pixmap( g_pParentWnd->m_pWidget, "window1.bmp" ); + pixmap = new_image_icon("window1.png"); gtk_widget_show( pixmap ); gtk_table_attach( GTK_TABLE( table ), pixmap, 0, 1, 0, 1, (GtkAttachOptions) ( 0 ), (GtkAttachOptions) ( 0 ), 0, 0 ); // view type 2 - pixmap = new_pixmap( g_pParentWnd->m_pWidget, "window2.bmp" ); + pixmap = new_image_icon("window2.png"); gtk_widget_show( pixmap ); gtk_table_attach( GTK_TABLE( table ), pixmap, 1, 2, 0, 1, (GtkAttachOptions) ( 0 ), (GtkAttachOptions) ( 0 ), 0, 0 ); // view type 3 - pixmap = new_pixmap( g_pParentWnd->m_pWidget, "window3.bmp" ); + pixmap = new_image_icon("window3.png"); gtk_widget_show( pixmap ); gtk_table_attach( GTK_TABLE( table ), pixmap, 2, 3, 0, 1, (GtkAttachOptions) ( 0 ), (GtkAttachOptions) ( 0 ), 0, 0 ); // view type 4 - pixmap = new_pixmap( g_pParentWnd->m_pWidget, "window4.bmp" ); + pixmap = new_image_icon("window4.png"); gtk_widget_show( pixmap ); gtk_table_attach( GTK_TABLE( table ), pixmap, 3, 4, 0, 1, (GtkAttachOptions) ( 0 ),