]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
Radiant:
authorGarux <garux@mail.ru>
Tue, 1 Aug 2017 11:03:16 +0000 (14:03 +0300)
committerGarux <garux@mail.ru>
Tue, 1 Aug 2017 11:03:16 +0000 (14:03 +0300)
misc...
* filter toobar buttons also handle right mouse clicks:
caulk: apply caulk tex
clip: toggle apply clip/weapclip tex
hint: toggle apply hint/hintlocal/hintskip tex
triggers: apply trigger tex
liquids: toggle apply watercaulk/lavacaulk/slimecaulk tex
areaportals: toggle apply nodraw/nodrawnonsolid tex
shader names are configurable through respective shader_* keys in .game file
details: make detail
structural: make structural
* png icons with real alpha; partially antialiased

277 files changed:
Makefile
contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.bmp [deleted file]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.png [new file with mode: 0644]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.bmp [deleted file]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.png [new file with mode: 0644]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.bmp [deleted file]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.png [new file with mode: 0644]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.bmp [deleted file]
contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.png [new file with mode: 0644]
contrib/bkgrnd2d/plugin.cpp
contrib/bobtoolz/bitmaps/README-bitmaps.txt [new file with mode: 0644]
contrib/bobtoolz/bitmaps/bobtoolz_caulk.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_cleanup.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_dropent.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_merge.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_poly.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_split.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_trainpathplot.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_treeplanter.bmp [deleted file]
contrib/bobtoolz/bitmaps/bobtoolz_turnedge.bmp [deleted file]
contrib/bobtoolz/bobToolz-GTK.cpp
contrib/camera/bitmaps/camera_insp.bmp [deleted file]
contrib/camera/bitmaps/camera_insp.png [new file with mode: 0644]
contrib/camera/camera.cpp
contrib/ufoaiplug/bitmaps/README-bitmaps.txt [new file with mode: 0644]
contrib/ufoaiplug/bitmaps/ufoai_actorclip.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level1.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level2.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level3.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level4.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level5.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level6.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level7.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_level8.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_nodraw.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_stepon.bmp [deleted file]
contrib/ufoaiplug/bitmaps/ufoai_weaponclip.bmp [deleted file]
contrib/ufoaiplug/ufoai_gtk.cpp
libs/gtkutil/dialog.cpp
libs/gtkutil/image.cpp
plugins/shaders/plugin.cpp
plugins/shaders/shaders.cpp
radiant/camwindow.cpp
radiant/entity.cpp
radiant/environment.cpp
radiant/environment.h
radiant/filterbar.cpp [new file with mode: 0644]
radiant/filterbar.h [new file with mode: 0644]
radiant/gtkdlgs.cpp
radiant/main.cpp
radiant/mainframe.cpp
radiant/patchmanip.cpp
radiant/texwindow.cpp
setup/data/tools/bitmaps/black.bmp [deleted file]
setup/data/tools/bitmaps/black.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_flipx.bmp [deleted file]
setup/data/tools/bitmaps/brush_flipx.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_flipy.bmp [deleted file]
setup/data/tools/bitmaps/brush_flipy.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_flipz.bmp [deleted file]
setup/data/tools/bitmaps/brush_flipz.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_rotatex.bmp [deleted file]
setup/data/tools/bitmaps/brush_rotatex.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_rotatey.bmp [deleted file]
setup/data/tools/bitmaps/brush_rotatey.png [new file with mode: 0644]
setup/data/tools/bitmaps/brush_rotatez.bmp [deleted file]
setup/data/tools/bitmaps/brush_rotatez.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_bevel.bmp [deleted file]
setup/data/tools/bitmaps/cap_bevel.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_cylinder.bmp [deleted file]
setup/data/tools/bitmaps/cap_cylinder.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_endcap.bmp [deleted file]
setup/data/tools/bitmaps/cap_endcap.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_ibevel.bmp [deleted file]
setup/data/tools/bitmaps/cap_ibevel.png [new file with mode: 0644]
setup/data/tools/bitmaps/cap_iendcap.bmp [deleted file]
setup/data/tools/bitmaps/cap_iendcap.png [new file with mode: 0644]
setup/data/tools/bitmaps/console.bmp [deleted file]
setup/data/tools/bitmaps/console.png [new file with mode: 0644]
setup/data/tools/bitmaps/curve_cap.bmp [deleted file]
setup/data/tools/bitmaps/curve_cap.png [new file with mode: 0644]
setup/data/tools/bitmaps/dontselectcurve.bmp [deleted file]
setup/data/tools/bitmaps/dontselectcurve.png [new file with mode: 0644]
setup/data/tools/bitmaps/dontselectmodel.bmp [deleted file]
setup/data/tools/bitmaps/dontselectmodel.png [new file with mode: 0644]
setup/data/tools/bitmaps/ellipsis.bmp [deleted file]
setup/data/tools/bitmaps/ellipsis.png [new file with mode: 0644]
setup/data/tools/bitmaps/entities.bmp [deleted file]
setup/data/tools/bitmaps/entities.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-areaportal.bmp [deleted file]
setup/data/tools/bitmaps/f-areaportal.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-caulk.bmp [deleted file]
setup/data/tools/bitmaps/f-caulk.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-clip.bmp [deleted file]
setup/data/tools/bitmaps/f-clip.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-decals.bmp [deleted file]
setup/data/tools/bitmaps/f-decals.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-details.bmp [deleted file]
setup/data/tools/bitmaps/f-details.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-entities.bmp [deleted file]
setup/data/tools/bitmaps/f-entities.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-hint.bmp [deleted file]
setup/data/tools/bitmaps/f-hint.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-invert.bmp [deleted file]
setup/data/tools/bitmaps/f-invert.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-liquids.bmp [deleted file]
setup/data/tools/bitmaps/f-liquids.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-models.bmp [deleted file]
setup/data/tools/bitmaps/f-models.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-reset.bmp [deleted file]
setup/data/tools/bitmaps/f-reset.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-structural.bmp [deleted file]
setup/data/tools/bitmaps/f-structural.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-translucent.bmp [deleted file]
setup/data/tools/bitmaps/f-translucent.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-triggers.bmp [deleted file]
setup/data/tools/bitmaps/f-triggers.png [new file with mode: 0644]
setup/data/tools/bitmaps/f-world.bmp [deleted file]
setup/data/tools/bitmaps/f-world.png [new file with mode: 0644]
setup/data/tools/bitmaps/file_open.bmp [deleted file]
setup/data/tools/bitmaps/file_open.png [new file with mode: 0644]
setup/data/tools/bitmaps/file_save.bmp [deleted file]
setup/data/tools/bitmaps/file_save.png [new file with mode: 0644]
setup/data/tools/bitmaps/icon.bmp [deleted file]
setup/data/tools/bitmaps/icon.png [new file with mode: 0644]
setup/data/tools/bitmaps/lightinspector.bmp [deleted file]
setup/data/tools/bitmaps/lightinspector.png [new file with mode: 0644]
setup/data/tools/bitmaps/logo.bmp [deleted file]
setup/data/tools/bitmaps/logo.png [new file with mode: 0644]
setup/data/tools/bitmaps/modify_edges.bmp [deleted file]
setup/data/tools/bitmaps/modify_edges.png [new file with mode: 0644]
setup/data/tools/bitmaps/modify_faces.bmp [deleted file]
setup/data/tools/bitmaps/modify_faces.png [new file with mode: 0644]
setup/data/tools/bitmaps/modify_vertices.bmp [deleted file]
setup/data/tools/bitmaps/modify_vertices.png [new file with mode: 0644]
setup/data/tools/bitmaps/noFalloff.bmp [deleted file]
setup/data/tools/bitmaps/noFalloff.png [new file with mode: 0644]
setup/data/tools/bitmaps/notex.bmp [deleted file]
setup/data/tools/bitmaps/notex.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_bend.bmp [deleted file]
setup/data/tools/bitmaps/patch_bend.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_drilldown.bmp [deleted file]
setup/data/tools/bitmaps/patch_drilldown.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_insdel.bmp [deleted file]
setup/data/tools/bitmaps/patch_insdel.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_showboundingbox.bmp [deleted file]
setup/data/tools/bitmaps/patch_showboundingbox.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_weld.bmp [deleted file]
setup/data/tools/bitmaps/patch_weld.png [new file with mode: 0644]
setup/data/tools/bitmaps/patch_wireframe.bmp [deleted file]
setup/data/tools/bitmaps/patch_wireframe.png [new file with mode: 0644]
setup/data/tools/bitmaps/popup_selection.bmp [deleted file]
setup/data/tools/bitmaps/popup_selection.png [new file with mode: 0644]
setup/data/tools/bitmaps/redo.bmp [deleted file]
setup/data/tools/bitmaps/redo.png [new file with mode: 0644]
setup/data/tools/bitmaps/refresh_models.bmp [deleted file]
setup/data/tools/bitmaps/refresh_models.png [new file with mode: 0644]
setup/data/tools/bitmaps/scalelockx.bmp [deleted file]
setup/data/tools/bitmaps/scalelockx.png [new file with mode: 0644]
setup/data/tools/bitmaps/scalelocky.bmp [deleted file]
setup/data/tools/bitmaps/scalelocky.png [new file with mode: 0644]
setup/data/tools/bitmaps/scalelockz.bmp [deleted file]
setup/data/tools/bitmaps/scalelockz.png [new file with mode: 0644]
setup/data/tools/bitmaps/select_mouseresize.bmp [deleted file]
setup/data/tools/bitmaps/select_mouseresize.png [new file with mode: 0644]
setup/data/tools/bitmaps/select_mouserotate.bmp [deleted file]
setup/data/tools/bitmaps/select_mouserotate.png [new file with mode: 0644]
setup/data/tools/bitmaps/select_mousescale.bmp [deleted file]
setup/data/tools/bitmaps/select_mousescale.png [new file with mode: 0644]
setup/data/tools/bitmaps/select_mousetranslate.bmp [deleted file]
setup/data/tools/bitmaps/select_mousetranslate.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_csgmerge.bmp [deleted file]
setup/data/tools/bitmaps/selection_csgmerge.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_csgsubtract.bmp [deleted file]
setup/data/tools/bitmaps/selection_csgsubtract.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_makehollow.bmp [deleted file]
setup/data/tools/bitmaps/selection_makehollow.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_makeroom.bmp [deleted file]
setup/data/tools/bitmaps/selection_makeroom.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_selectcompletetall.bmp [deleted file]
setup/data/tools/bitmaps/selection_selectcompletetall.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_selectcompletetall_old.bmp [deleted file]
setup/data/tools/bitmaps/selection_selectcompletetall_old.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_selectinside.bmp [deleted file]
setup/data/tools/bitmaps/selection_selectinside.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_selectpartialtall.bmp [deleted file]
setup/data/tools/bitmaps/selection_selectpartialtall.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_selectpartialtall_old.bmp [deleted file]
setup/data/tools/bitmaps/selection_selectpartialtall_old.png [new file with mode: 0644]
setup/data/tools/bitmaps/selection_selecttouching.bmp [deleted file]
setup/data/tools/bitmaps/selection_selecttouching.png [new file with mode: 0644]
setup/data/tools/bitmaps/shadernotex.bmp [deleted file]
setup/data/tools/bitmaps/shadernotex.png [new file with mode: 0644]
setup/data/tools/bitmaps/show_entities.bmp [deleted file]
setup/data/tools/bitmaps/show_entities.png [new file with mode: 0644]
setup/data/tools/bitmaps/splash.bmp [deleted file]
setup/data/tools/bitmaps/splash.png [new file with mode: 0644]
setup/data/tools/bitmaps/texture_browser.bmp [deleted file]
setup/data/tools/bitmaps/texture_browser.png [new file with mode: 0644]
setup/data/tools/bitmaps/texture_lock.bmp [deleted file]
setup/data/tools/bitmaps/texture_lock.png [new file with mode: 0644]
setup/data/tools/bitmaps/textures_popup.bmp [deleted file]
setup/data/tools/bitmaps/textures_popup.png [new file with mode: 0644]
setup/data/tools/bitmaps/undo.bmp [deleted file]
setup/data/tools/bitmaps/undo.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_cameratoggle.bmp [deleted file]
setup/data/tools/bitmaps/view_cameratoggle.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_cameraupdate.bmp [deleted file]
setup/data/tools/bitmaps/view_cameraupdate.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_change.bmp [deleted file]
setup/data/tools/bitmaps/view_change.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_clipper.bmp [deleted file]
setup/data/tools/bitmaps/view_clipper.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_cubicclipping.bmp [deleted file]
setup/data/tools/bitmaps/view_cubicclipping.png [new file with mode: 0644]
setup/data/tools/bitmaps/view_entity.bmp [deleted file]
setup/data/tools/bitmaps/view_entity.png [new file with mode: 0644]
setup/data/tools/bitmaps/white.bmp [deleted file]
setup/data/tools/bitmaps/white.png [new file with mode: 0644]
setup/data/tools/bitmaps/window1.bmp [deleted file]
setup/data/tools/bitmaps/window1.png [new file with mode: 0644]
setup/data/tools/bitmaps/window2.bmp [deleted file]
setup/data/tools/bitmaps/window2.png [new file with mode: 0644]
setup/data/tools/bitmaps/window3.bmp [deleted file]
setup/data/tools/bitmaps/window3.png [new file with mode: 0644]
setup/data/tools/bitmaps/window4.bmp [deleted file]
setup/data/tools/bitmaps/window4.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_caulk.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_caulk.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_cleanup_old.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_dropent.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_dropent.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_merge.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_merge.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_merge_old.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_poly.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_poly.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_poly_old.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_split.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_split.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_split_old.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.bmp [deleted file]
setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_actorclip.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_actorclip.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level1.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level1.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level2.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level2.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level3.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level3.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level4.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level4.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level5.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level5.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level6.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level6.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level7.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level7.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_level8.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_level8.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_nodraw.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_nodraw.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_stepon.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_stepon.png [new file with mode: 0644]
setup/data/tools/plugins/bitmaps/ufoai_weaponclip.bmp [deleted file]
setup/data/tools/plugins/bitmaps/ufoai_weaponclip.png [new file with mode: 0644]

index 911e5ff054a9b778769b6d08a14622696a984b4d..b7521e0a6f94b459b53654114b4552b065f2ef41 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -646,6 +646,7 @@ $(INSTALLDIR)/radiant.$(EXE): \
        radiant/error.o \
        radiant/feedback.o \
        radiant/filetypes.o \
+       radiant/filterbar.o \
        radiant/filters.o \
        radiant/findtexturedialog.o \
        radiant/glwidget.o \
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.bmp b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.bmp
deleted file mode 100644 (file)
index bc307e2..0000000
Binary files a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.bmp and /dev/null differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.png b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.png
new file mode 100644 (file)
index 0000000..895cdd8
Binary files /dev/null and b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_conf.png differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.bmp b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.bmp
deleted file mode 100644 (file)
index d95fa28..0000000
Binary files a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.bmp and /dev/null differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.png b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.png
new file mode 100644 (file)
index 0000000..e03b63a
Binary files /dev/null and b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xy_toggle.png differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.bmp b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.bmp
deleted file mode 100644 (file)
index 6af8308..0000000
Binary files a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.bmp and /dev/null differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.png b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.png
new file mode 100644 (file)
index 0000000..cbc9809
Binary files /dev/null and b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_xz_toggle.png differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.bmp b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.bmp
deleted file mode 100644 (file)
index de9f4df..0000000
Binary files a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.bmp and /dev/null differ
diff --git a/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.png b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.png
new file mode 100644 (file)
index 0000000..8ecffa7
Binary files /dev/null and b/contrib/bkgrnd2d/bitmaps/bkgrnd2d_yz_toggle.png differ
index 447057110ad4d99fe5fcdebdb7eed55ba8a37473..35fb072071286131eff680f1ea983cd2e79c63b2 100644 (file)
@@ -107,28 +107,28 @@ struct toolbar_button_info_s
 struct toolbar_button_info_s toolbar_buttons[NUM_TOOLBAR_BUTTONS] =
 {
        {
-               "bkgrnd2d_xy_toggle.bmp",
+               "bkgrnd2d_xy_toggle.png",
                "xy background",
                "Toggle xy background image",
                DoBkgrndToggleXY,
                IToolbarButton::eToggleButton
        },
        {
-               "bkgrnd2d_xz_toggle.bmp",
+               "bkgrnd2d_xz_toggle.png",
                "xz background",
                "Toggle xz background image",
                DoBkgrndToggleXZ,
                IToolbarButton::eToggleButton
        },
        {
-               "bkgrnd2d_yz_toggle.bmp",
+               "bkgrnd2d_yz_toggle.png",
                "yz background",
                "Toggle yz background image",
                DoBkgrndToggleYZ,
                IToolbarButton::eToggleButton
        },
        {
-               "bkgrnd2d_conf.bmp",
+               "bkgrnd2d_conf.png",
                "Configure",
                "Configure background images",
                ShowBackgroundDialog,
diff --git a/contrib/bobtoolz/bitmaps/README-bitmaps.txt b/contrib/bobtoolz/bitmaps/README-bitmaps.txt
new file mode 100644 (file)
index 0000000..48e7794
--- /dev/null
@@ -0,0 +1 @@
+bobtoolz bitmaps are in setup/data/tools/plugins/bitmaps 
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_caulk.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_caulk.bmp
deleted file mode 100644 (file)
index 5223950..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_caulk.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_cleanup.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_cleanup.bmp
deleted file mode 100644 (file)
index 33cc949..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_cleanup.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_dropent.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_dropent.bmp
deleted file mode 100644 (file)
index 2fcdcba..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_dropent.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_merge.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_merge.bmp
deleted file mode 100644 (file)
index cc5e272..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_merge.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_poly.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_poly.bmp
deleted file mode 100644 (file)
index ed720e9..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_poly.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_split.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_split.bmp
deleted file mode 100644 (file)
index fbb1571..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_split.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_trainpathplot.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_trainpathplot.bmp
deleted file mode 100644 (file)
index 66537dc..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_trainpathplot.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_treeplanter.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_treeplanter.bmp
deleted file mode 100644 (file)
index 08f55f3..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_treeplanter.bmp and /dev/null differ
diff --git a/contrib/bobtoolz/bitmaps/bobtoolz_turnedge.bmp b/contrib/bobtoolz/bitmaps/bobtoolz_turnedge.bmp
deleted file mode 100644 (file)
index b72cb2a..0000000
Binary files a/contrib/bobtoolz/bitmaps/bobtoolz_turnedge.bmp and /dev/null differ
index d7893955406236a4c0ece233280a04b81ac89641..4eecfd92d5b210538188b3e91190826babe90f39 100644 (file)
@@ -166,20 +166,20 @@ class CBobtoolzToolbarButton : public IToolbarButton
 public:
 virtual const char* getImage() const {
        switch ( mIndex ) {
-       case 0: return "bobtoolz_cleanup.bmp";
-       case 1: return "bobtoolz_poly.bmp";
-       case 2: return "bobtoolz_caulk.bmp";
+       case 0: return "bobtoolz_cleanup.png";
+       case 1: return "bobtoolz_poly.png";
+       case 2: return "bobtoolz_caulk.png";
        case 3: return "";
-       case 4: return "bobtoolz_treeplanter.bmp";
-       case 5: return "bobtoolz_trainpathplot.bmp";
-       case 6: return "bobtoolz_dropent.bmp";
+       case 4: return "bobtoolz_treeplanter.png";
+       case 5: return "bobtoolz_trainpathplot.png";
+       case 6: return "bobtoolz_dropent.png";
        case 7: return "";
-       case 8: return "bobtoolz_merge.bmp";
-       case 9: return "bobtoolz_split.bmp";
-       case 10: return "bobtoolz_splitrow.bmp";
-       case 11: return "bobtoolz_splitcol.bmp";
+       case 8: return "bobtoolz_merge.png";
+       case 9: return "bobtoolz_split.png";
+       case 10: return "bobtoolz_splitrow.png";
+       case 11: return "bobtoolz_splitcol.png";
        case 12: return "";
-       case 13: return "bobtoolz_turnedge.bmp";
+       case 13: return "bobtoolz_turnedge.png";
        }
        return NULL;
 }
diff --git a/contrib/camera/bitmaps/camera_insp.bmp b/contrib/camera/bitmaps/camera_insp.bmp
deleted file mode 100644 (file)
index 1286716..0000000
Binary files a/contrib/camera/bitmaps/camera_insp.bmp and /dev/null differ
diff --git a/contrib/camera/bitmaps/camera_insp.png b/contrib/camera/bitmaps/camera_insp.png
new file mode 100644 (file)
index 0000000..5296615
Binary files /dev/null and b/contrib/camera/bitmaps/camera_insp.png differ
index 5647f4c0f082f0bd683368eceb73f271b6c5b196..0ee788d06c6f0d0688296400260b261da778c40a 100644 (file)
@@ -132,7 +132,7 @@ class CameraInspectorButton : public IToolbarButton
 {
 public:
 virtual const char* getImage() const {
-       return "camera_insp.bmp";
+       return "camera_insp.png";
 }
 virtual const char* getText() const {
        return "Inspector";
diff --git a/contrib/ufoaiplug/bitmaps/README-bitmaps.txt b/contrib/ufoaiplug/bitmaps/README-bitmaps.txt
new file mode 100644 (file)
index 0000000..575e508
--- /dev/null
@@ -0,0 +1 @@
+ufoaiplug bitmaps are in setup/data/tools/plugins/bitmaps 
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_actorclip.bmp b/contrib/ufoaiplug/bitmaps/ufoai_actorclip.bmp
deleted file mode 100644 (file)
index 43bdf93..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_actorclip.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level1.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level1.bmp
deleted file mode 100644 (file)
index 80a4b29..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level1.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level2.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level2.bmp
deleted file mode 100644 (file)
index e84e254..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level2.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level3.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level3.bmp
deleted file mode 100644 (file)
index 141c324..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level3.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level4.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level4.bmp
deleted file mode 100644 (file)
index 3783a80..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level4.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level5.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level5.bmp
deleted file mode 100644 (file)
index 8f62851..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level5.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level6.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level6.bmp
deleted file mode 100644 (file)
index 418fdd2..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level6.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level7.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level7.bmp
deleted file mode 100644 (file)
index d82dab6..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level7.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_level8.bmp b/contrib/ufoaiplug/bitmaps/ufoai_level8.bmp
deleted file mode 100644 (file)
index c380953..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_level8.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_nodraw.bmp b/contrib/ufoaiplug/bitmaps/ufoai_nodraw.bmp
deleted file mode 100644 (file)
index b994856..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_nodraw.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_stepon.bmp b/contrib/ufoaiplug/bitmaps/ufoai_stepon.bmp
deleted file mode 100644 (file)
index 828449e..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_stepon.bmp and /dev/null differ
diff --git a/contrib/ufoaiplug/bitmaps/ufoai_weaponclip.bmp b/contrib/ufoaiplug/bitmaps/ufoai_weaponclip.bmp
deleted file mode 100644 (file)
index fe6b348..0000000
Binary files a/contrib/ufoaiplug/bitmaps/ufoai_weaponclip.bmp and /dev/null differ
index c01a31fe721158748cda9cd267571fb59640f956..c547047431968301491b59ff066da872e697ab80 100644 (file)
@@ -88,18 +88,18 @@ public:
 virtual const char* getImage() const {
        switch ( mIndex )
        {
-       case 0: return "ufoai_level1.bmp";
-       case 1: return "ufoai_level2.bmp";
-       case 2: return "ufoai_level3.bmp";
-       case 3: return "ufoai_level4.bmp";
-       case 4: return "ufoai_level5.bmp";
-       case 5: return "ufoai_level6.bmp";
-       case 6: return "ufoai_level7.bmp";
-       case 7: return "ufoai_level8.bmp";
-       case 8: return "ufoai_stepon.bmp";
-       case 9: return "ufoai_actorclip.bmp";
-       case 10: return "ufoai_weaponclip.bmp";
-       case 11: return "ufoai_nodraw.bmp";
+       case 0: return "ufoai_level1.png";
+       case 1: return "ufoai_level2.png";
+       case 2: return "ufoai_level3.png";
+       case 3: return "ufoai_level4.png";
+       case 4: return "ufoai_level5.png";
+       case 5: return "ufoai_level6.png";
+       case 6: return "ufoai_level7.png";
+       case 7: return "ufoai_level8.png";
+       case 8: return "ufoai_stepon.png";
+       case 9: return "ufoai_actorclip.png";
+       case 10: return "ufoai_weaponclip.png";
+       case 11: return "ufoai_nodraw.png";
        }
        return NULL;
 }
index 59f5c5d9328161c359f4f37836eb38778c0fd7dd..fb513e97d5d0e1982c09bd7d487220a6a2df364e 100644 (file)
@@ -219,7 +219,7 @@ PathEntry PathEntry_new(){
 
        // browse button
        GtkButton* button = GTK_BUTTON( gtk_button_new() );
-       button_set_icon( button, "ellipsis.bmp" );
+       button_set_icon( button, "ellipsis.png" );
        gtk_widget_show( GTK_WIDGET( button ) );
        gtk_box_pack_end( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
 
index 4605d3f5f9ad79548bb8315c533c0a6c7ee27e3a..2791fd47393a09a921458c8b31839e6392af8273 100644 (file)
@@ -45,7 +45,8 @@ GdkPixbuf* pixbuf_new_from_file_with_mask( const char* filename ){
        }
        else
        {
-               GdkPixbuf* rgba = gdk_pixbuf_add_alpha( rgb, TRUE, 255, 0, 255 );
+               //GdkPixbuf* rgba = gdk_pixbuf_add_alpha( rgb, TRUE, 255, 0, 255 ); //pink to alpha
+               GdkPixbuf* rgba = gdk_pixbuf_add_alpha( rgb, FALSE, 255, 0, 255 ); //alpha
                gdk_pixbuf_unref( rgb );
                return rgba;
        }
index 3f2cc48351fc6d4780ef16caa5a7d209ac9ece4d..f7c74fb3fc2168bb5f9374f1f2946325733bb9bc 100644 (file)
@@ -41,7 +41,8 @@ class ShadersDependencies :
 ImageModuleRef m_bitmapModule;
 public:
 ShadersDependencies() :
-       m_bitmapModule( "bmp" ){
+       //m_bitmapModule( "bmp" ){
+       m_bitmapModule( "png" ){
 }
 ImageModuleRef& getBitmapModule(){
        return m_bitmapModule;
index 7a16594eb0a36142705815a26a1ec098a3f8793e..44cc0baf200d5c1ddeb96690d285e45ceabbec37 100644 (file)
@@ -207,7 +207,7 @@ Image* loadHeightmap( void* environment, const char* name ){
 Image* loadSpecial( void* environment, const char* name ){
        if ( *name == '_' ) { // special image
                StringOutputStream bitmapName( 256 );
-               bitmapName << GlobalRadiant().getAppPath() << "bitmaps/" << name + 1 << ".bmp";
+               bitmapName << GlobalRadiant().getAppPath() << "bitmaps/" << name + 1 << ".png";
                Image* image = loadBitmap( environment, bitmapName.c_str() );
                if ( image != 0 ) {
                        return image;
@@ -951,7 +951,7 @@ void realise(){
 
                {
                        StringOutputStream name( 256 );
-                       name << GlobalRadiant().getAppPath() << "bitmaps/" << ( IsDefault() ? "notex.bmp" : "shadernotex.bmp" );
+                       name << GlobalRadiant().getAppPath() << "bitmaps/" << ( IsDefault() ? "notex.png" : "shadernotex.png" );
                        m_pTexture = GlobalTexturesCache().capture( LoadImageCallback( 0, loadBitmap ), name.c_str() );
                }
        }
index e849f4ccd3e179775c23674ffcb58fc04577fb49..20fcb853829a2cf47dcf48795071c3f096d4c9f8 100644 (file)
@@ -1694,7 +1694,7 @@ void Camera_ToggleFarClip(){
 
 
 void CamWnd_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_toggle_button( toolbar, "Cubic clip the camera view (Ctrl + \\)", "view_cubicclipping.bmp", "ToggleCubicClip" );
+       toolbar_append_toggle_button( toolbar, "Cubic clip the camera view (Ctrl + \\)", "view_cubicclipping.png", "ToggleCubicClip" );
 }
 
 void CamWnd_registerShortcuts(){
index a5f42177f1beb5bc57cd99fbf1a93330b2287e46..cc863c611f255fcb2d1b0e03ed212480ffa0d2ea 100644 (file)
@@ -391,7 +391,7 @@ void Entity_createFromSelection( const char* name, const Vector3& origin ){
        }
 
        if ( string_compare_nocase_n( name, "trigger_", 8 ) == 0 && brushesSelected ){
-               const char* shader = g_pGameDescription->getKeyValue( "trigger_shader" );
+               const char* shader = g_pGameDescription->getKeyValue( "shader_trigger" );
                if ( shader && *shader ){
                        Scene_PatchSetShader_Selected( GlobalSceneGraph(), shader );
                        Scene_BrushSetShader_Selected( GlobalSceneGraph(), shader );
index fc23e9b0f593eb612f56f0705cce2b98deab2fc6..99aa6c26769bffb13f137ac861b8f76fcc5cbf3a 100644 (file)
@@ -257,14 +257,14 @@ void environment_init( int argc, char* argv[] ){
 
 #include <windows.h>
 
-char openCmdMap[260];
+char* openCmdMap;
 
 void cmdMap(){
-       openCmdMap[0] = '\0';
+       openCmdMap = NULL;
        for ( int i = 1; i < g_argc; ++i )
        {
                if ( !stricmp( g_argv[i] + strlen(g_argv[i]) - 4, ".map" ) ){
-                       strcpy( openCmdMap, g_argv[i] );
+                       openCmdMap = g_argv[i];
                }
        }
 }
index 8d15115eddaf4bb006ff29c60c754792f62cf084..18398e8c0d7016e73a50214dfb614f415fc22dd8 100644 (file)
@@ -30,7 +30,7 @@ extern int g_argc;
 extern char** g_argv;
 
 #if defined( WIN32 )
-extern char openCmdMap[260];
+extern char* openCmdMap;
 #endif
 
 
diff --git a/radiant/filterbar.cpp b/radiant/filterbar.cpp
new file mode 100644 (file)
index 0000000..8251a4b
--- /dev/null
@@ -0,0 +1,221 @@
+#include "filterbar.h"
+#include <gtk/gtktoolbar.h>
+#include "gtkmisc.h"
+#include "gtkutil/widget.h"
+#include "stream/stringstream.h"
+#include "select.h"
+#include "iundo.h"
+#include "preferences.h"
+
+#include "commands.h"
+#include "gtkutil/accelerator.h"
+#include "generic/callback.h"
+
+
+
+
+int ToggleActions = 0;
+int ButtonNum = 0;
+
+gboolean ToggleActions0( GtkWidget *widget, GdkEvent *event, gpointer user_data ){
+       ToggleActions = 0;
+       return FALSE;
+       //globalOutputStream() << "ToggleActions\n";
+}
+
+void SetCommonShader( const char* key, const char* shader ){
+       const char* gotShader = g_pGameDescription->getKeyValue( key );
+       UndoableCommand undo( "textureNameSetSelected" );
+       if ( gotShader && *gotShader ){
+               Select_SetShader( gotShader );
+       }
+       else{
+               Select_SetShader( shader );
+       }
+}
+
+
+gboolean Areaportals_button_press( GtkWidget *widget, GdkEventButton *event, gpointer data ){
+       if ( event->button == 3 && event->type == GDK_BUTTON_PRESS ) {
+               if ( ButtonNum == 1 ){
+                       ToggleActions %= 2;
+               }
+               else{
+                       ToggleActions = 0;
+                       ButtonNum = 1;
+               }
+               if( ToggleActions == 0 ){
+                       SetCommonShader( "shader_nodraw", "textures/common/nodraw" );
+               }
+               else if( ToggleActions == 1 ){
+                       SetCommonShader( "shader_nodrawnonsolid", "textures/common/nodrawnonsolid" );
+               }
+               //SetCommonShader( "shader_caulk", "textures/common/caulk" );
+               //globalOutputStream() << "Found '" << "fullname" << "'\n";
+               ToggleActions++;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+
+gboolean Caulk_button_press( GtkWidget *widget, GdkEventButton *event, gpointer data ){
+       if ( event->button == 3 && event->type == GDK_BUTTON_PRESS ) {
+               SetCommonShader( "shader_caulk", "textures/common/caulk" );
+               ToggleActions = 0;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+gboolean Clip_button_press( GtkWidget *widget, GdkEventButton *event, gpointer data ){
+       if ( event->button == 3 && event->type == GDK_BUTTON_PRESS ) {
+               if ( ButtonNum == 3 ){
+                       ToggleActions %= 2;
+               }
+               else{
+                       ToggleActions = 0;
+                       ButtonNum = 3;
+               }
+               if( ToggleActions == 0 ){
+                       SetCommonShader( "shader_clip", "textures/common/clip" );
+               }
+               else if( ToggleActions == 1 ){
+                       SetCommonShader( "shader_weapclip", "textures/common/weapclip" );
+               }
+               ToggleActions++;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+gboolean Liquids_button_press( GtkWidget *widget, GdkEventButton *event, gpointer data ){
+       if ( event->button == 3 && event->type == GDK_BUTTON_PRESS ) {
+               if ( ButtonNum == 4 ){
+                       ToggleActions %= 3;
+               }
+               else{
+                       ToggleActions = 0;
+                       ButtonNum = 4;
+               }
+               if( ToggleActions == 0 ){
+                       SetCommonShader( "shader_watercaulk", "textures/common/watercaulk" );
+               }
+               else if( ToggleActions == 1 ){
+                       SetCommonShader( "shader_lavacaulk", "textures/common/lavacaulk" );
+               }
+               else if( ToggleActions == 2 ){
+                       SetCommonShader( "shader_slimecaulk", "textures/common/slimecaulk" );
+               }
+               ToggleActions++;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+
+gboolean Hint_button_press( GtkWidget *widget, GdkEventButton *event, gpointer data ){
+       if ( event->button == 3 && event->type == GDK_BUTTON_PRESS ) {
+               if ( ButtonNum == 5 ){
+                       ToggleActions %= 3;
+               }
+               else{
+                       ToggleActions = 0;
+                       ButtonNum = 5;
+               }
+               if( ToggleActions == 0 ){
+                       SetCommonShader( "shader_hint", "textures/common/hint" );
+               }
+               else if( ToggleActions == 1 ){
+                       SetCommonShader( "shader_hintlocal", "textures/common/hintlocal" );
+               }
+               else if( ToggleActions == 2 ){
+                       SetCommonShader( "shader_hintskip", "textures/common/hintskip" );
+               }
+               ToggleActions++;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+gboolean Trigger_button_press( GtkWidget *widget, GdkEventButton *event, gpointer data ){
+       if ( event->button == 3 && event->type == GDK_BUTTON_PRESS ) {
+               SetCommonShader( "shader_trigger", "textures/common/trigger" );
+               ToggleActions = 0;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+gboolean Detail_button_press( GtkWidget *widget, GdkEventButton *event, gpointer data ){
+       if ( event->button == 3 && event->type == GDK_BUTTON_PRESS ) {
+               GlobalCommands_find( "MakeDetail" ).m_callback();
+               ToggleActions = 0;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+gboolean Structural_button_press( GtkWidget *widget, GdkEventButton *event, gpointer data ){
+       if ( event->button == 3 && event->type == GDK_BUTTON_PRESS ) {
+               GlobalCommands_find( "MakeStructural" ).m_callback();
+               ToggleActions = 0;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+
+GtkToolbar* create_filter_toolbar(){
+                       GtkToolbar* filter_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
+                       gtk_widget_show( GTK_WIDGET( filter_toolbar ) );
+                       g_signal_connect( G_OBJECT( filter_toolbar ), "enter_notify_event", G_CALLBACK( ToggleActions0 ), 0 );
+
+                       GtkToggleButton* button;
+
+                       toolbar_append_toggle_button( filter_toolbar, "World (ALT + 1)", "f-world.png", "FilterWorldBrushes" );
+
+                       button = toolbar_append_toggle_button( filter_toolbar, "Details (CTRL + D)\nRightClick: MakeDetail", "f-details.png", "FilterDetails" );
+                       g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Detail_button_press ), 0 );
+
+                       button = toolbar_append_toggle_button( filter_toolbar, "Structural (CTRL + SHIFT + D)\nRightClick: MakeStructural", "f-structural.png", "FilterStructural" );
+                       g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Structural_button_press ), 0 );
+
+
+                       toolbar_append_toggle_button( filter_toolbar, "Patches (CTRL + P)", "patch_wireframe.png", "FilterPatches" );
+                       gtk_toolbar_append_space( GTK_TOOLBAR( filter_toolbar ) );
+
+                       button = toolbar_append_toggle_button( filter_toolbar, "Areaportals (ALT + 3)\nRightClick: toggle tex\n\tnoDraw\n\tnoDrawNonSolid", "f-areaportal.png", "FilterAreaportals" );
+                       g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Areaportals_button_press ), 0 );
+
+
+
+                       toolbar_append_toggle_button( filter_toolbar, "Translucent (ALT + 4)", "f-translucent.png", "FilterTranslucent" );
+
+                       button = toolbar_append_toggle_button( filter_toolbar, "Liquids (ALT + 5)\nRightClick: toggle tex\n\twaterCaulk\n\tlavaCaulk\n\tslimeCaulk", "f-liquids.png", "FilterLiquids" );
+                       g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Liquids_button_press ), 0 );
+
+                       button = toolbar_append_toggle_button( filter_toolbar, "Caulk (ALT + 6)\nRightClick: tex Caulk", "f-caulk.png", "FilterCaulk" );
+                       g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Caulk_button_press ), 0 );
+
+                       button = toolbar_append_toggle_button( filter_toolbar, "Clips (ALT + 7)\nRightClick: toggle tex\n\tplayerClip\n\tweapClip", "f-clip.png", "FilterClips" );
+                       g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Clip_button_press ), 0 );
+
+                       button = toolbar_append_toggle_button( filter_toolbar, "HintsSkips (CTRL + H)\nRightClick: toggle tex\n\thint\n\thintLocal\n\thintSkip", "f-hint.png", "FilterHintsSkips" );
+                       g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Hint_button_press ), 0 );
+
+                       //toolbar_append_toggle_button( filter_toolbar, "Paths (ALT + 8)", "texture_lock.png", "FilterPaths" );
+                       gtk_toolbar_append_space( GTK_TOOLBAR( filter_toolbar ) );
+                       toolbar_append_toggle_button( filter_toolbar, "Entities (ALT + 2)", "f-entities.png", "FilterEntities" );
+                       toolbar_append_toggle_button( filter_toolbar, "Lights (ALT + 0)", "lightinspector.png", "FilterLights" );
+                       toolbar_append_toggle_button( filter_toolbar, "Models (SHIFT + M)", "f-models.png", "FilterModels" );
+
+                       button = toolbar_append_toggle_button( filter_toolbar, "Triggers (CTRL + SHIFT + T)\nRightClick: tex Trigger", "f-triggers.png", "FilterTriggers" );
+                       g_signal_connect( G_OBJECT( button ), "button_press_event", G_CALLBACK( Trigger_button_press ), 0 );
+
+                       //toolbar_append_toggle_button( filter_toolbar, "Decals (SHIFT + D)", "f-decals.png", "FilterDecals" );
+                       gtk_toolbar_append_space( GTK_TOOLBAR( filter_toolbar ) );
+                       toolbar_append_button( filter_toolbar, "InvertFilters", "f-invert.png", "InvertFilters" );
+                       toolbar_append_button( filter_toolbar, "ResetFilters", "f-reset.png", "ResetFilters" );
+                       return filter_toolbar;
+}
diff --git a/radiant/filterbar.h b/radiant/filterbar.h
new file mode 100644 (file)
index 0000000..7b2888b
--- /dev/null
@@ -0,0 +1,16 @@
+#if !defined( INCLUDED_FILTERBAR_H )
+#define INCLUDED_FILTERBAR_H
+
+#include <gtk/gtktoolbar.h>
+
+
+
+
+
+
+
+GtkToolbar* create_filter_toolbar();
+
+
+
+#endif
index b01965af67de7ccb08aa9ed4ce3015866f19f9b9..3780aecc3370e091fea16f8675426dfe36483925 100644 (file)
@@ -468,7 +468,7 @@ void DoAbout(){
                                        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.bmp" );
+                                               GtkImage* image = new_local_image( "logo.png" );
                                                gtk_widget_show( GTK_WIDGET( image ) );
                                                gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( image ) );
                                        }
index 0a1eb3b1d3a709630a649ef68f75364cd7b4adfc..2e7c93b95d3668bca054b4451a50904aee34a857 100644 (file)
@@ -635,7 +635,7 @@ int main( int argc, char* argv[] ){
        hide_splash();
 
 #ifdef WIN32
-       if( openCmdMap[0] != '\0' ){
+       if( openCmdMap && *openCmdMap ){
                Map_LoadFile( openCmdMap );
        }
        else
index 45348b98a24b403bdc84b026bc63799c1fdbb744..a4eaf8dfabdfd048ed40ccf5b2a803d9f4178484 100644 (file)
 #include "feedback.h"
 #include "referencecache.h"
 
+#include "filterbar.h"
 
 
 struct layout_globals_t
@@ -2291,56 +2292,56 @@ void register_shortcuts(){
 }
 
 void File_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "Open an existing map (CTRL + O)", "file_open.bmp", "OpenMap" );
-       toolbar_append_button( toolbar, "Save the active map (CTRL + S)", "file_save.bmp", "SaveMap" );
+       toolbar_append_button( toolbar, "Open an existing map (CTRL + O)", "file_open.png", "OpenMap" );
+       toolbar_append_button( toolbar, "Save the active map (CTRL + S)", "file_save.png", "SaveMap" );
 }
 
 void UndoRedo_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "Undo (CTRL + Z)", "undo.bmp", "Undo" );
-       toolbar_append_button( toolbar, "Redo (CTRL + Y)", "redo.bmp", "Redo" );
+       toolbar_append_button( toolbar, "Undo (CTRL + Z)", "undo.png", "Undo" );
+       toolbar_append_button( toolbar, "Redo (CTRL + Y)", "redo.png", "Redo" );
 }
 
 void RotateFlip_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "x-axis Flip", "brush_flipx.bmp", "MirrorSelectionX" );
-       toolbar_append_button( toolbar, "x-axis Rotate", "brush_rotatex.bmp", "RotateSelectionX" );
-       toolbar_append_button( toolbar, "y-axis Flip", "brush_flipy.bmp", "MirrorSelectionY" );
-       toolbar_append_button( toolbar, "y-axis Rotate", "brush_rotatey.bmp", "RotateSelectionY" );
-       toolbar_append_button( toolbar, "z-axis Flip", "brush_flipz.bmp", "MirrorSelectionZ" );
-       toolbar_append_button( toolbar, "z-axis Rotate", "brush_rotatez.bmp", "RotateSelectionZ" );
+       toolbar_append_button( toolbar, "x-axis Flip", "brush_flipx.png", "MirrorSelectionX" );
+       toolbar_append_button( toolbar, "x-axis Rotate", "brush_rotatex.png", "RotateSelectionX" );
+       toolbar_append_button( toolbar, "y-axis Flip", "brush_flipy.png", "MirrorSelectionY" );
+       toolbar_append_button( toolbar, "y-axis Rotate", "brush_rotatey.png", "RotateSelectionY" );
+       toolbar_append_button( toolbar, "z-axis Flip", "brush_flipz.png", "MirrorSelectionZ" );
+       toolbar_append_button( toolbar, "z-axis Rotate", "brush_rotatez.png", "RotateSelectionZ" );
 }
 
 void Select_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "Select touching", "selection_selecttouching.bmp", "SelectTouching" );
-       toolbar_append_button( toolbar, "Select inside", "selection_selectinside.bmp", "SelectInside" );
+       toolbar_append_button( toolbar, "Select touching", "selection_selecttouching.png", "SelectTouching" );
+       toolbar_append_button( toolbar, "Select inside", "selection_selectinside.png", "SelectInside" );
 }
 
 void CSG_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "CSG Subtract (SHIFT + U)", "selection_csgsubtract.bmp", "CSGSubtract" );
-       toolbar_append_button( toolbar, "CSG Merge (CTRL + U)", "selection_csgmerge.bmp", "CSGMerge" );
-       toolbar_append_button( toolbar, "Hollow", "selection_makehollow.bmp", "CSGHollow" );
-       toolbar_append_button( toolbar, "Room", "selection_makeroom.bmp", "CSGroom" );
+       toolbar_append_button( toolbar, "CSG Subtract (SHIFT + U)", "selection_csgsubtract.png", "CSGSubtract" );
+       toolbar_append_button( toolbar, "CSG Merge (CTRL + U)", "selection_csgmerge.png", "CSGMerge" );
+       toolbar_append_button( toolbar, "Hollow", "selection_makehollow.png", "CSGHollow" );
+       toolbar_append_button( toolbar, "Room", "selection_makeroom.png", "CSGroom" );
 }
 
 void ComponentModes_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_toggle_button( toolbar, "Select Vertices (V)", "modify_vertices.bmp", "DragVertices" );
-       toolbar_append_toggle_button( toolbar, "Select Edges (E)", "modify_edges.bmp", "DragEdges" );
-       toolbar_append_toggle_button( toolbar, "Select Faces (F)", "modify_faces.bmp", "DragFaces" );
+       toolbar_append_toggle_button( toolbar, "Select Vertices (V)", "modify_vertices.png", "DragVertices" );
+       toolbar_append_toggle_button( toolbar, "Select Edges (E)", "modify_edges.png", "DragEdges" );
+       toolbar_append_toggle_button( toolbar, "Select Faces (F)", "modify_faces.png", "DragFaces" );
 }
 
 void Clipper_constructToolbar( GtkToolbar* toolbar ){
 
-       toolbar_append_toggle_button( toolbar, "Clipper (X)", "view_clipper.bmp", "ToggleClipper" );
+       toolbar_append_toggle_button( toolbar, "Clipper (X)", "view_clipper.png", "ToggleClipper" );
 }
 
 void XYWnd_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "Change views", "view_change.bmp", "NextView" );
+       toolbar_append_button( toolbar, "Change views", "view_change.png", "NextView" );
 }
 
 void Manipulators_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_toggle_button( toolbar, "Translate (W)", "select_mousetranslate.bmp", "MouseTranslate" );
-       toolbar_append_toggle_button( toolbar, "Rotate (R)", "select_mouserotate.bmp", "MouseRotate" );
-       toolbar_append_toggle_button( toolbar, "Scale", "select_mousescale.bmp", "MouseScale" );
-       toolbar_append_toggle_button( toolbar, "Resize (Q)", "select_mouseresize.bmp", "MouseDrag" );
+       toolbar_append_toggle_button( toolbar, "Translate (W)", "select_mousetranslate.png", "MouseTranslate" );
+       toolbar_append_toggle_button( toolbar, "Rotate (R)", "select_mouserotate.png", "MouseRotate" );
+       toolbar_append_toggle_button( toolbar, "Scale", "select_mousescale.png", "MouseScale" );
+       toolbar_append_toggle_button( toolbar, "Resize (Q)", "select_mouseresize.png", "MouseDrag" );
 
        Clipper_constructToolbar( toolbar );
 }
@@ -2396,18 +2397,18 @@ GtkToolbar* create_main_toolbar( MainFrame::EViewStyle style ){
 
        gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
 
-       toolbar_append_toggle_button( toolbar, "Texture Lock (SHIFT + T)", "texture_lock.bmp", "TogTexLock" );
+       toolbar_append_toggle_button( toolbar, "Texture Lock (SHIFT + T)", "texture_lock.png", "TogTexLock" );
 
        gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
 
-       GtkButton* g_view_entities_button = toolbar_append_button( toolbar, "Entities (N)", "entities.bmp", "ToggleEntityInspector" );
-       GtkButton* g_view_console_button = toolbar_append_button( toolbar, "Console (O)", "console.bmp", "ToggleConsole" );
-       GtkButton* g_view_textures_button = toolbar_append_button( toolbar, "Texture Browser (T)", "texture_browser.bmp", "ToggleTextures" );
+       GtkButton* g_view_entities_button = toolbar_append_button( toolbar, "Entities (N)", "entities.png", "ToggleEntityInspector" );
+       GtkButton* g_view_console_button = toolbar_append_button( toolbar, "Console (O)", "console.png", "ToggleConsole" );
+       GtkButton* g_view_textures_button = toolbar_append_button( toolbar, "Texture Browser (T)", "texture_browser.png", "ToggleTextures" );
        // TODO: call light inspector
-       //GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.bmp", "ToggleLightInspector");
+       //GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.png", "ToggleLightInspector");
 
        gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
-       GtkButton* g_refresh_models_button = toolbar_append_button( toolbar, "Refresh Models", "refresh_models.bmp", "RefreshReferences" );
+       GtkButton* g_refresh_models_button = toolbar_append_button( toolbar, "Refresh Models", "refresh_models.png", "RefreshReferences" );
 
 
        // disable the console and texture button in the regular layouts
@@ -2699,7 +2700,7 @@ GtkWindow* create_splash(){
        gtk_window_set_position( window, GTK_WIN_POS_CENTER );
        gtk_container_set_border_width( GTK_CONTAINER( window ), 0 );
 
-       GtkImage* image = new_local_image( "splash.bmp" );
+       GtkImage* image = new_local_image( "splash.png" );
        gtk_widget_show( GTK_WIDGET( image ) );
        gtk_container_add( GTK_CONTAINER( window ), GTK_WIDGET( image ) );
 
@@ -2743,7 +2744,7 @@ void MainFrame::Create(){
 
 #if !defined( WIN32 )
        {
-               GdkPixbuf* pixbuf = pixbuf_new_from_file_with_mask( "bitmaps/icon.bmp" );
+               GdkPixbuf* pixbuf = pixbuf_new_from_file_with_mask( "bitmaps/icon.png" );
                if ( pixbuf != 0 ) {
                        gtk_window_set_icon( window, pixbuf );
                        gdk_pixbuf_unref( pixbuf );
@@ -2798,31 +2799,7 @@ void MainFrame::Create(){
                        }
                }
                if ( g_Layout_enableFilterToolbar.m_value ){
-                       GtkToolbar* filter_toolbar = GTK_TOOLBAR( gtk_toolbar_new() );
-                       gtk_widget_show( GTK_WIDGET( filter_toolbar ) );
-
-                       toolbar_append_toggle_button( filter_toolbar, "World (ALT + 1)", "f-world.bmp", "FilterWorldBrushes" );
-                       toolbar_append_toggle_button( filter_toolbar, "Details (CTRL + D)", "f-details.bmp", "FilterDetails" );
-                       toolbar_append_toggle_button( filter_toolbar, "Structural (CTRL + SHIFT + D)", "f-structural.bmp", "FilterStructural" );
-                       toolbar_append_toggle_button( filter_toolbar, "Patches (CTRL + P)", "patch_wireframe.bmp", "FilterPatches" );
-                       gtk_toolbar_append_space( GTK_TOOLBAR( filter_toolbar ) );
-                       toolbar_append_toggle_button( filter_toolbar, "Areaportals (ALT + 3)", "f-areaportal.bmp", "FilterAreaportals" );
-                       toolbar_append_toggle_button( filter_toolbar, "Translucent (ALT + 4)", "f-translucent.bmp", "FilterTranslucent" );
-                       toolbar_append_toggle_button( filter_toolbar, "Liquids (ALT + 5)", "f-liquids.bmp", "FilterLiquids" );
-                       toolbar_append_toggle_button( filter_toolbar, "Caulk (ALT + 6)", "f-caulk.bmp", "FilterCaulk" );
-                       toolbar_append_toggle_button( filter_toolbar, "Clips (ALT + 7)", "f-clip.bmp", "FilterClips" );
-                       toolbar_append_toggle_button( filter_toolbar, "HintsSkips (CTRL + H)", "f-hint.bmp", "FilterHintsSkips" );
-                       //toolbar_append_toggle_button( filter_toolbar, "Paths (ALT + 8)", "texture_lock.bmp", "FilterPaths" );
-                       gtk_toolbar_append_space( GTK_TOOLBAR( filter_toolbar ) );
-                       toolbar_append_toggle_button( filter_toolbar, "Entities (ALT + 2)", "f-entities.bmp", "FilterEntities" );
-                       toolbar_append_toggle_button( filter_toolbar, "Lights (ALT + 0)", "lightinspector.bmp", "FilterLights" );
-                       toolbar_append_toggle_button( filter_toolbar, "Models (SHIFT + M)", "f-models.bmp", "FilterModels" );
-                       toolbar_append_toggle_button( filter_toolbar, "Triggers (CTRL + SHIFT + T)", "f-triggers.bmp", "FilterTriggers" );
-                       //toolbar_append_toggle_button( filter_toolbar, "Decals (SHIFT + D)", "f-decals.bmp", "FilterDecals" );
-                       gtk_toolbar_append_space( GTK_TOOLBAR( filter_toolbar ) );
-                       toolbar_append_button( filter_toolbar, "InvertFilters", "f-invert.bmp", "InvertFilters" );
-                       toolbar_append_button( filter_toolbar, "ResetFilters", "f-reset.bmp", "ResetFilters" );
-
+                       GtkToolbar* filter_toolbar = create_filter_toolbar();
                        gtk_box_pack_start( GTK_BOX( PFbox ), GTK_WIDGET( filter_toolbar ), TRUE, TRUE, 0 );
                }
        }
@@ -3202,7 +3179,7 @@ void GlobalGL_sharedContextDestroyed(){
 
 void Layout_constructPreferences( PreferencesPage& page ){
        {
-               const char* layouts[] = { "window1.bmp", "window2.bmp", "window3.bmp", "window4.bmp" };
+               const char* layouts[] = { "window1.png", "window2.png", "window3.png", "window4.png" };
                page.appendRadioIcons(
                        "Window Layout",
                        STRING_ARRAY_RANGE( layouts ),
index b2c0b2d6f32a49f2fb1be34f8a9ceb6865f0aa72..5a6db29cb5b5f87dd9cc40edd110e5ca73a88ffa 100644 (file)
@@ -820,7 +820,7 @@ void Patch_registerCommands(){
 }
 
 void Patch_constructToolbar( GtkToolbar* toolbar ){
-       toolbar_append_button( toolbar, "Put caps on the current patch (SHIFT + C)", "curve_cap.bmp", "CapCurrentCurve" );
+       toolbar_append_button( toolbar, "Put caps on the current patch (SHIFT + C)", "curve_cap.png", "CapCurrentCurve" );
 }
 
 void Patch_constructMenu( GtkMenu* menu ){
@@ -1152,35 +1152,35 @@ EMessageBoxReturn DoCapDlg( ECapDialog* type ){
                                gtk_table_set_col_spacings( table, 5 );
 
                                {
-                                       GtkImage* image = new_local_image( "cap_bevel.bmp" );
+                                       GtkImage* image = new_local_image( "cap_bevel.png" );
                                        gtk_widget_show( GTK_WIDGET( image ) );
                                        gtk_table_attach( table, GTK_WIDGET( image ), 0, 1, 0, 1,
                                                                          (GtkAttachOptions) ( GTK_FILL ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkImage* image = new_local_image( "cap_endcap.bmp" );
+                                       GtkImage* image = new_local_image( "cap_endcap.png" );
                                        gtk_widget_show( GTK_WIDGET( image ) );
                                        gtk_table_attach( table, GTK_WIDGET( image ), 0, 1, 1, 2,
                                                                          (GtkAttachOptions) ( GTK_FILL ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkImage* image = new_local_image( "cap_ibevel.bmp" );
+                                       GtkImage* image = new_local_image( "cap_ibevel.png" );
                                        gtk_widget_show( GTK_WIDGET( image ) );
                                        gtk_table_attach( table, GTK_WIDGET( image ), 0, 1, 2, 3,
                                                                          (GtkAttachOptions) ( GTK_FILL ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkImage* image = new_local_image( "cap_iendcap.bmp" );
+                                       GtkImage* image = new_local_image( "cap_iendcap.png" );
                                        gtk_widget_show( GTK_WIDGET( image ) );
                                        gtk_table_attach( table, GTK_WIDGET( image ), 0, 1, 3, 4,
                                                                          (GtkAttachOptions) ( GTK_FILL ),
                                                                          (GtkAttachOptions) ( 0 ), 0, 0 );
                                }
                                {
-                                       GtkImage* image = new_local_image( "cap_cylinder.bmp" );
+                                       GtkImage* image = new_local_image( "cap_cylinder.png" );
                                        gtk_widget_show( GTK_WIDGET( image ) );
                                        gtk_table_attach( table, GTK_WIDGET( image ), 0, 1, 4, 5,
                                                                          (GtkAttachOptions) ( GTK_FILL ),
index 24e71a38cc3795453f89b550de671683ebabd7a5..2b685f52a254e9e3ade2ee62e9f5d6d46c81faef 100644 (file)
@@ -2047,11 +2047,11 @@ void TextureBrowser_checkTagFile(){
 
 void TextureBrowser_SetNotex(){
        StringOutputStream name( 256 );
-       name << GlobalRadiant().getAppPath() << "bitmaps/notex.bmp";
+       name << GlobalRadiant().getAppPath() << "bitmaps/notex.png";
        g_notex = name.c_str();
 
        name = NULL;
-       name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.bmp";
+       name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.png";
        g_shadernotex = name.c_str();
 }
 
diff --git a/setup/data/tools/bitmaps/black.bmp b/setup/data/tools/bitmaps/black.bmp
deleted file mode 100644 (file)
index 8fc59ba..0000000
Binary files a/setup/data/tools/bitmaps/black.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/black.png b/setup/data/tools/bitmaps/black.png
new file mode 100644 (file)
index 0000000..6d3e454
Binary files /dev/null and b/setup/data/tools/bitmaps/black.png differ
diff --git a/setup/data/tools/bitmaps/brush_flipx.bmp b/setup/data/tools/bitmaps/brush_flipx.bmp
deleted file mode 100644 (file)
index 48ee0db..0000000
Binary files a/setup/data/tools/bitmaps/brush_flipx.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_flipx.png b/setup/data/tools/bitmaps/brush_flipx.png
new file mode 100644 (file)
index 0000000..6207339
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_flipx.png differ
diff --git a/setup/data/tools/bitmaps/brush_flipy.bmp b/setup/data/tools/bitmaps/brush_flipy.bmp
deleted file mode 100644 (file)
index d740877..0000000
Binary files a/setup/data/tools/bitmaps/brush_flipy.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_flipy.png b/setup/data/tools/bitmaps/brush_flipy.png
new file mode 100644 (file)
index 0000000..ce537f3
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_flipy.png differ
diff --git a/setup/data/tools/bitmaps/brush_flipz.bmp b/setup/data/tools/bitmaps/brush_flipz.bmp
deleted file mode 100644 (file)
index 017c33e..0000000
Binary files a/setup/data/tools/bitmaps/brush_flipz.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_flipz.png b/setup/data/tools/bitmaps/brush_flipz.png
new file mode 100644 (file)
index 0000000..d2d0708
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_flipz.png differ
diff --git a/setup/data/tools/bitmaps/brush_rotatex.bmp b/setup/data/tools/bitmaps/brush_rotatex.bmp
deleted file mode 100644 (file)
index c7e5505..0000000
Binary files a/setup/data/tools/bitmaps/brush_rotatex.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_rotatex.png b/setup/data/tools/bitmaps/brush_rotatex.png
new file mode 100644 (file)
index 0000000..37c46fc
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_rotatex.png differ
diff --git a/setup/data/tools/bitmaps/brush_rotatey.bmp b/setup/data/tools/bitmaps/brush_rotatey.bmp
deleted file mode 100644 (file)
index e50e5d6..0000000
Binary files a/setup/data/tools/bitmaps/brush_rotatey.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_rotatey.png b/setup/data/tools/bitmaps/brush_rotatey.png
new file mode 100644 (file)
index 0000000..c3b33e7
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_rotatey.png differ
diff --git a/setup/data/tools/bitmaps/brush_rotatez.bmp b/setup/data/tools/bitmaps/brush_rotatez.bmp
deleted file mode 100644 (file)
index 52ab554..0000000
Binary files a/setup/data/tools/bitmaps/brush_rotatez.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/brush_rotatez.png b/setup/data/tools/bitmaps/brush_rotatez.png
new file mode 100644 (file)
index 0000000..e56f1cb
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_rotatez.png differ
diff --git a/setup/data/tools/bitmaps/cap_bevel.bmp b/setup/data/tools/bitmaps/cap_bevel.bmp
deleted file mode 100644 (file)
index 3bb4186..0000000
Binary files a/setup/data/tools/bitmaps/cap_bevel.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/cap_bevel.png b/setup/data/tools/bitmaps/cap_bevel.png
new file mode 100644 (file)
index 0000000..b39565d
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_bevel.png differ
diff --git a/setup/data/tools/bitmaps/cap_cylinder.bmp b/setup/data/tools/bitmaps/cap_cylinder.bmp
deleted file mode 100644 (file)
index 2196926..0000000
Binary files a/setup/data/tools/bitmaps/cap_cylinder.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/cap_cylinder.png b/setup/data/tools/bitmaps/cap_cylinder.png
new file mode 100644 (file)
index 0000000..9688930
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_cylinder.png differ
diff --git a/setup/data/tools/bitmaps/cap_endcap.bmp b/setup/data/tools/bitmaps/cap_endcap.bmp
deleted file mode 100644 (file)
index e6cea65..0000000
Binary files a/setup/data/tools/bitmaps/cap_endcap.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/cap_endcap.png b/setup/data/tools/bitmaps/cap_endcap.png
new file mode 100644 (file)
index 0000000..049b250
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_endcap.png differ
diff --git a/setup/data/tools/bitmaps/cap_ibevel.bmp b/setup/data/tools/bitmaps/cap_ibevel.bmp
deleted file mode 100644 (file)
index b1fa49b..0000000
Binary files a/setup/data/tools/bitmaps/cap_ibevel.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/cap_ibevel.png b/setup/data/tools/bitmaps/cap_ibevel.png
new file mode 100644 (file)
index 0000000..c284b66
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_ibevel.png differ
diff --git a/setup/data/tools/bitmaps/cap_iendcap.bmp b/setup/data/tools/bitmaps/cap_iendcap.bmp
deleted file mode 100644 (file)
index da1f5b6..0000000
Binary files a/setup/data/tools/bitmaps/cap_iendcap.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/cap_iendcap.png b/setup/data/tools/bitmaps/cap_iendcap.png
new file mode 100644 (file)
index 0000000..11a3f16
Binary files /dev/null and b/setup/data/tools/bitmaps/cap_iendcap.png differ
diff --git a/setup/data/tools/bitmaps/console.bmp b/setup/data/tools/bitmaps/console.bmp
deleted file mode 100644 (file)
index 7fe64b0..0000000
Binary files a/setup/data/tools/bitmaps/console.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/console.png b/setup/data/tools/bitmaps/console.png
new file mode 100644 (file)
index 0000000..4004739
Binary files /dev/null and b/setup/data/tools/bitmaps/console.png differ
diff --git a/setup/data/tools/bitmaps/curve_cap.bmp b/setup/data/tools/bitmaps/curve_cap.bmp
deleted file mode 100644 (file)
index 574e761..0000000
Binary files a/setup/data/tools/bitmaps/curve_cap.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/curve_cap.png b/setup/data/tools/bitmaps/curve_cap.png
new file mode 100644 (file)
index 0000000..6ce1c0c
Binary files /dev/null and b/setup/data/tools/bitmaps/curve_cap.png differ
diff --git a/setup/data/tools/bitmaps/dontselectcurve.bmp b/setup/data/tools/bitmaps/dontselectcurve.bmp
deleted file mode 100644 (file)
index a7b9795..0000000
Binary files a/setup/data/tools/bitmaps/dontselectcurve.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/dontselectcurve.png b/setup/data/tools/bitmaps/dontselectcurve.png
new file mode 100644 (file)
index 0000000..66254df
Binary files /dev/null and b/setup/data/tools/bitmaps/dontselectcurve.png differ
diff --git a/setup/data/tools/bitmaps/dontselectmodel.bmp b/setup/data/tools/bitmaps/dontselectmodel.bmp
deleted file mode 100644 (file)
index e81b118..0000000
Binary files a/setup/data/tools/bitmaps/dontselectmodel.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/dontselectmodel.png b/setup/data/tools/bitmaps/dontselectmodel.png
new file mode 100644 (file)
index 0000000..82c472a
Binary files /dev/null and b/setup/data/tools/bitmaps/dontselectmodel.png differ
diff --git a/setup/data/tools/bitmaps/ellipsis.bmp b/setup/data/tools/bitmaps/ellipsis.bmp
deleted file mode 100644 (file)
index a4360a9..0000000
Binary files a/setup/data/tools/bitmaps/ellipsis.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/ellipsis.png b/setup/data/tools/bitmaps/ellipsis.png
new file mode 100644 (file)
index 0000000..270f7b1
Binary files /dev/null and b/setup/data/tools/bitmaps/ellipsis.png differ
diff --git a/setup/data/tools/bitmaps/entities.bmp b/setup/data/tools/bitmaps/entities.bmp
deleted file mode 100644 (file)
index ce3d812..0000000
Binary files a/setup/data/tools/bitmaps/entities.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/entities.png b/setup/data/tools/bitmaps/entities.png
new file mode 100644 (file)
index 0000000..e6fa2d1
Binary files /dev/null and b/setup/data/tools/bitmaps/entities.png differ
diff --git a/setup/data/tools/bitmaps/f-areaportal.bmp b/setup/data/tools/bitmaps/f-areaportal.bmp
deleted file mode 100644 (file)
index e0c95b7..0000000
Binary files a/setup/data/tools/bitmaps/f-areaportal.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-areaportal.png b/setup/data/tools/bitmaps/f-areaportal.png
new file mode 100644 (file)
index 0000000..dd85eaf
Binary files /dev/null and b/setup/data/tools/bitmaps/f-areaportal.png differ
diff --git a/setup/data/tools/bitmaps/f-caulk.bmp b/setup/data/tools/bitmaps/f-caulk.bmp
deleted file mode 100644 (file)
index a021277..0000000
Binary files a/setup/data/tools/bitmaps/f-caulk.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-caulk.png b/setup/data/tools/bitmaps/f-caulk.png
new file mode 100644 (file)
index 0000000..3b6b899
Binary files /dev/null and b/setup/data/tools/bitmaps/f-caulk.png differ
diff --git a/setup/data/tools/bitmaps/f-clip.bmp b/setup/data/tools/bitmaps/f-clip.bmp
deleted file mode 100644 (file)
index 85f4213..0000000
Binary files a/setup/data/tools/bitmaps/f-clip.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-clip.png b/setup/data/tools/bitmaps/f-clip.png
new file mode 100644 (file)
index 0000000..e69ae95
Binary files /dev/null and b/setup/data/tools/bitmaps/f-clip.png differ
diff --git a/setup/data/tools/bitmaps/f-decals.bmp b/setup/data/tools/bitmaps/f-decals.bmp
deleted file mode 100644 (file)
index 9ccfcb7..0000000
Binary files a/setup/data/tools/bitmaps/f-decals.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-decals.png b/setup/data/tools/bitmaps/f-decals.png
new file mode 100644 (file)
index 0000000..a07fa5d
Binary files /dev/null and b/setup/data/tools/bitmaps/f-decals.png differ
diff --git a/setup/data/tools/bitmaps/f-details.bmp b/setup/data/tools/bitmaps/f-details.bmp
deleted file mode 100644 (file)
index d5f9b36..0000000
Binary files a/setup/data/tools/bitmaps/f-details.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-details.png b/setup/data/tools/bitmaps/f-details.png
new file mode 100644 (file)
index 0000000..d31bf02
Binary files /dev/null and b/setup/data/tools/bitmaps/f-details.png differ
diff --git a/setup/data/tools/bitmaps/f-entities.bmp b/setup/data/tools/bitmaps/f-entities.bmp
deleted file mode 100644 (file)
index a4bc42a..0000000
Binary files a/setup/data/tools/bitmaps/f-entities.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-entities.png b/setup/data/tools/bitmaps/f-entities.png
new file mode 100644 (file)
index 0000000..7e90d43
Binary files /dev/null and b/setup/data/tools/bitmaps/f-entities.png differ
diff --git a/setup/data/tools/bitmaps/f-hint.bmp b/setup/data/tools/bitmaps/f-hint.bmp
deleted file mode 100644 (file)
index a8cfa52..0000000
Binary files a/setup/data/tools/bitmaps/f-hint.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-hint.png b/setup/data/tools/bitmaps/f-hint.png
new file mode 100644 (file)
index 0000000..0358c22
Binary files /dev/null and b/setup/data/tools/bitmaps/f-hint.png differ
diff --git a/setup/data/tools/bitmaps/f-invert.bmp b/setup/data/tools/bitmaps/f-invert.bmp
deleted file mode 100644 (file)
index 7514af7..0000000
Binary files a/setup/data/tools/bitmaps/f-invert.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-invert.png b/setup/data/tools/bitmaps/f-invert.png
new file mode 100644 (file)
index 0000000..b7a7b45
Binary files /dev/null and b/setup/data/tools/bitmaps/f-invert.png differ
diff --git a/setup/data/tools/bitmaps/f-liquids.bmp b/setup/data/tools/bitmaps/f-liquids.bmp
deleted file mode 100644 (file)
index 9f98208..0000000
Binary files a/setup/data/tools/bitmaps/f-liquids.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-liquids.png b/setup/data/tools/bitmaps/f-liquids.png
new file mode 100644 (file)
index 0000000..38b59e3
Binary files /dev/null and b/setup/data/tools/bitmaps/f-liquids.png differ
diff --git a/setup/data/tools/bitmaps/f-models.bmp b/setup/data/tools/bitmaps/f-models.bmp
deleted file mode 100644 (file)
index b96fc24..0000000
Binary files a/setup/data/tools/bitmaps/f-models.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-models.png b/setup/data/tools/bitmaps/f-models.png
new file mode 100644 (file)
index 0000000..3d936c4
Binary files /dev/null and b/setup/data/tools/bitmaps/f-models.png differ
diff --git a/setup/data/tools/bitmaps/f-reset.bmp b/setup/data/tools/bitmaps/f-reset.bmp
deleted file mode 100644 (file)
index 373701c..0000000
Binary files a/setup/data/tools/bitmaps/f-reset.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-reset.png b/setup/data/tools/bitmaps/f-reset.png
new file mode 100644 (file)
index 0000000..18bf28e
Binary files /dev/null and b/setup/data/tools/bitmaps/f-reset.png differ
diff --git a/setup/data/tools/bitmaps/f-structural.bmp b/setup/data/tools/bitmaps/f-structural.bmp
deleted file mode 100644 (file)
index fca065d..0000000
Binary files a/setup/data/tools/bitmaps/f-structural.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-structural.png b/setup/data/tools/bitmaps/f-structural.png
new file mode 100644 (file)
index 0000000..040fb87
Binary files /dev/null and b/setup/data/tools/bitmaps/f-structural.png differ
diff --git a/setup/data/tools/bitmaps/f-translucent.bmp b/setup/data/tools/bitmaps/f-translucent.bmp
deleted file mode 100644 (file)
index bae6919..0000000
Binary files a/setup/data/tools/bitmaps/f-translucent.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-translucent.png b/setup/data/tools/bitmaps/f-translucent.png
new file mode 100644 (file)
index 0000000..98c2fe1
Binary files /dev/null and b/setup/data/tools/bitmaps/f-translucent.png differ
diff --git a/setup/data/tools/bitmaps/f-triggers.bmp b/setup/data/tools/bitmaps/f-triggers.bmp
deleted file mode 100644 (file)
index adcb341..0000000
Binary files a/setup/data/tools/bitmaps/f-triggers.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-triggers.png b/setup/data/tools/bitmaps/f-triggers.png
new file mode 100644 (file)
index 0000000..4b2a8f9
Binary files /dev/null and b/setup/data/tools/bitmaps/f-triggers.png differ
diff --git a/setup/data/tools/bitmaps/f-world.bmp b/setup/data/tools/bitmaps/f-world.bmp
deleted file mode 100644 (file)
index 0b5b72c..0000000
Binary files a/setup/data/tools/bitmaps/f-world.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/f-world.png b/setup/data/tools/bitmaps/f-world.png
new file mode 100644 (file)
index 0000000..8f63d82
Binary files /dev/null and b/setup/data/tools/bitmaps/f-world.png differ
diff --git a/setup/data/tools/bitmaps/file_open.bmp b/setup/data/tools/bitmaps/file_open.bmp
deleted file mode 100644 (file)
index 754f10f..0000000
Binary files a/setup/data/tools/bitmaps/file_open.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/file_open.png b/setup/data/tools/bitmaps/file_open.png
new file mode 100644 (file)
index 0000000..bbfe7cc
Binary files /dev/null and b/setup/data/tools/bitmaps/file_open.png differ
diff --git a/setup/data/tools/bitmaps/file_save.bmp b/setup/data/tools/bitmaps/file_save.bmp
deleted file mode 100644 (file)
index 651afb6..0000000
Binary files a/setup/data/tools/bitmaps/file_save.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/file_save.png b/setup/data/tools/bitmaps/file_save.png
new file mode 100644 (file)
index 0000000..2d5a09f
Binary files /dev/null and b/setup/data/tools/bitmaps/file_save.png differ
diff --git a/setup/data/tools/bitmaps/icon.bmp b/setup/data/tools/bitmaps/icon.bmp
deleted file mode 100644 (file)
index 01aec6e..0000000
Binary files a/setup/data/tools/bitmaps/icon.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/icon.png b/setup/data/tools/bitmaps/icon.png
new file mode 100644 (file)
index 0000000..15fcf02
Binary files /dev/null and b/setup/data/tools/bitmaps/icon.png differ
diff --git a/setup/data/tools/bitmaps/lightinspector.bmp b/setup/data/tools/bitmaps/lightinspector.bmp
deleted file mode 100644 (file)
index 00b00a9..0000000
Binary files a/setup/data/tools/bitmaps/lightinspector.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/lightinspector.png b/setup/data/tools/bitmaps/lightinspector.png
new file mode 100644 (file)
index 0000000..93688b3
Binary files /dev/null and b/setup/data/tools/bitmaps/lightinspector.png differ
diff --git a/setup/data/tools/bitmaps/logo.bmp b/setup/data/tools/bitmaps/logo.bmp
deleted file mode 100644 (file)
index ddbd346..0000000
Binary files a/setup/data/tools/bitmaps/logo.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/logo.png b/setup/data/tools/bitmaps/logo.png
new file mode 100644 (file)
index 0000000..fd5afd4
Binary files /dev/null and b/setup/data/tools/bitmaps/logo.png differ
diff --git a/setup/data/tools/bitmaps/modify_edges.bmp b/setup/data/tools/bitmaps/modify_edges.bmp
deleted file mode 100644 (file)
index 7b048f9..0000000
Binary files a/setup/data/tools/bitmaps/modify_edges.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/modify_edges.png b/setup/data/tools/bitmaps/modify_edges.png
new file mode 100644 (file)
index 0000000..0bb8714
Binary files /dev/null and b/setup/data/tools/bitmaps/modify_edges.png differ
diff --git a/setup/data/tools/bitmaps/modify_faces.bmp b/setup/data/tools/bitmaps/modify_faces.bmp
deleted file mode 100644 (file)
index 03d9f8c..0000000
Binary files a/setup/data/tools/bitmaps/modify_faces.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/modify_faces.png b/setup/data/tools/bitmaps/modify_faces.png
new file mode 100644 (file)
index 0000000..7615c5b
Binary files /dev/null and b/setup/data/tools/bitmaps/modify_faces.png differ
diff --git a/setup/data/tools/bitmaps/modify_vertices.bmp b/setup/data/tools/bitmaps/modify_vertices.bmp
deleted file mode 100644 (file)
index c434732..0000000
Binary files a/setup/data/tools/bitmaps/modify_vertices.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/modify_vertices.png b/setup/data/tools/bitmaps/modify_vertices.png
new file mode 100644 (file)
index 0000000..70aa38a
Binary files /dev/null and b/setup/data/tools/bitmaps/modify_vertices.png differ
diff --git a/setup/data/tools/bitmaps/noFalloff.bmp b/setup/data/tools/bitmaps/noFalloff.bmp
deleted file mode 100644 (file)
index e86d10c..0000000
Binary files a/setup/data/tools/bitmaps/noFalloff.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/noFalloff.png b/setup/data/tools/bitmaps/noFalloff.png
new file mode 100644 (file)
index 0000000..55c6a80
Binary files /dev/null and b/setup/data/tools/bitmaps/noFalloff.png differ
diff --git a/setup/data/tools/bitmaps/notex.bmp b/setup/data/tools/bitmaps/notex.bmp
deleted file mode 100644 (file)
index b06664a..0000000
Binary files a/setup/data/tools/bitmaps/notex.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/notex.png b/setup/data/tools/bitmaps/notex.png
new file mode 100644 (file)
index 0000000..e09df39
Binary files /dev/null and b/setup/data/tools/bitmaps/notex.png differ
diff --git a/setup/data/tools/bitmaps/patch_bend.bmp b/setup/data/tools/bitmaps/patch_bend.bmp
deleted file mode 100644 (file)
index af4fc94..0000000
Binary files a/setup/data/tools/bitmaps/patch_bend.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_bend.png b/setup/data/tools/bitmaps/patch_bend.png
new file mode 100644 (file)
index 0000000..62eb756
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_bend.png differ
diff --git a/setup/data/tools/bitmaps/patch_drilldown.bmp b/setup/data/tools/bitmaps/patch_drilldown.bmp
deleted file mode 100644 (file)
index 01ebcf3..0000000
Binary files a/setup/data/tools/bitmaps/patch_drilldown.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_drilldown.png b/setup/data/tools/bitmaps/patch_drilldown.png
new file mode 100644 (file)
index 0000000..1794a13
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_drilldown.png differ
diff --git a/setup/data/tools/bitmaps/patch_insdel.bmp b/setup/data/tools/bitmaps/patch_insdel.bmp
deleted file mode 100644 (file)
index b60b76b..0000000
Binary files a/setup/data/tools/bitmaps/patch_insdel.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_insdel.png b/setup/data/tools/bitmaps/patch_insdel.png
new file mode 100644 (file)
index 0000000..362285e
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_insdel.png differ
diff --git a/setup/data/tools/bitmaps/patch_showboundingbox.bmp b/setup/data/tools/bitmaps/patch_showboundingbox.bmp
deleted file mode 100644 (file)
index 357cfaf..0000000
Binary files a/setup/data/tools/bitmaps/patch_showboundingbox.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_showboundingbox.png b/setup/data/tools/bitmaps/patch_showboundingbox.png
new file mode 100644 (file)
index 0000000..891f3c7
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_showboundingbox.png differ
diff --git a/setup/data/tools/bitmaps/patch_weld.bmp b/setup/data/tools/bitmaps/patch_weld.bmp
deleted file mode 100644 (file)
index a0c9973..0000000
Binary files a/setup/data/tools/bitmaps/patch_weld.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_weld.png b/setup/data/tools/bitmaps/patch_weld.png
new file mode 100644 (file)
index 0000000..3d53a6b
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_weld.png differ
diff --git a/setup/data/tools/bitmaps/patch_wireframe.bmp b/setup/data/tools/bitmaps/patch_wireframe.bmp
deleted file mode 100644 (file)
index 9804274..0000000
Binary files a/setup/data/tools/bitmaps/patch_wireframe.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/patch_wireframe.png b/setup/data/tools/bitmaps/patch_wireframe.png
new file mode 100644 (file)
index 0000000..78bb81e
Binary files /dev/null and b/setup/data/tools/bitmaps/patch_wireframe.png differ
diff --git a/setup/data/tools/bitmaps/popup_selection.bmp b/setup/data/tools/bitmaps/popup_selection.bmp
deleted file mode 100644 (file)
index 676c4d9..0000000
Binary files a/setup/data/tools/bitmaps/popup_selection.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/popup_selection.png b/setup/data/tools/bitmaps/popup_selection.png
new file mode 100644 (file)
index 0000000..217fa82
Binary files /dev/null and b/setup/data/tools/bitmaps/popup_selection.png differ
diff --git a/setup/data/tools/bitmaps/redo.bmp b/setup/data/tools/bitmaps/redo.bmp
deleted file mode 100644 (file)
index 32a373a..0000000
Binary files a/setup/data/tools/bitmaps/redo.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/redo.png b/setup/data/tools/bitmaps/redo.png
new file mode 100644 (file)
index 0000000..befec6e
Binary files /dev/null and b/setup/data/tools/bitmaps/redo.png differ
diff --git a/setup/data/tools/bitmaps/refresh_models.bmp b/setup/data/tools/bitmaps/refresh_models.bmp
deleted file mode 100644 (file)
index b6507f6..0000000
Binary files a/setup/data/tools/bitmaps/refresh_models.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/refresh_models.png b/setup/data/tools/bitmaps/refresh_models.png
new file mode 100644 (file)
index 0000000..ca77acb
Binary files /dev/null and b/setup/data/tools/bitmaps/refresh_models.png differ
diff --git a/setup/data/tools/bitmaps/scalelockx.bmp b/setup/data/tools/bitmaps/scalelockx.bmp
deleted file mode 100644 (file)
index 61363da..0000000
Binary files a/setup/data/tools/bitmaps/scalelockx.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/scalelockx.png b/setup/data/tools/bitmaps/scalelockx.png
new file mode 100644 (file)
index 0000000..9714120
Binary files /dev/null and b/setup/data/tools/bitmaps/scalelockx.png differ
diff --git a/setup/data/tools/bitmaps/scalelocky.bmp b/setup/data/tools/bitmaps/scalelocky.bmp
deleted file mode 100644 (file)
index 812394d..0000000
Binary files a/setup/data/tools/bitmaps/scalelocky.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/scalelocky.png b/setup/data/tools/bitmaps/scalelocky.png
new file mode 100644 (file)
index 0000000..7836242
Binary files /dev/null and b/setup/data/tools/bitmaps/scalelocky.png differ
diff --git a/setup/data/tools/bitmaps/scalelockz.bmp b/setup/data/tools/bitmaps/scalelockz.bmp
deleted file mode 100644 (file)
index 5692e4a..0000000
Binary files a/setup/data/tools/bitmaps/scalelockz.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/scalelockz.png b/setup/data/tools/bitmaps/scalelockz.png
new file mode 100644 (file)
index 0000000..f967680
Binary files /dev/null and b/setup/data/tools/bitmaps/scalelockz.png differ
diff --git a/setup/data/tools/bitmaps/select_mouseresize.bmp b/setup/data/tools/bitmaps/select_mouseresize.bmp
deleted file mode 100644 (file)
index ca0c9ac..0000000
Binary files a/setup/data/tools/bitmaps/select_mouseresize.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/select_mouseresize.png b/setup/data/tools/bitmaps/select_mouseresize.png
new file mode 100644 (file)
index 0000000..c841f05
Binary files /dev/null and b/setup/data/tools/bitmaps/select_mouseresize.png differ
diff --git a/setup/data/tools/bitmaps/select_mouserotate.bmp b/setup/data/tools/bitmaps/select_mouserotate.bmp
deleted file mode 100644 (file)
index 7f18a56..0000000
Binary files a/setup/data/tools/bitmaps/select_mouserotate.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/select_mouserotate.png b/setup/data/tools/bitmaps/select_mouserotate.png
new file mode 100644 (file)
index 0000000..6174568
Binary files /dev/null and b/setup/data/tools/bitmaps/select_mouserotate.png differ
diff --git a/setup/data/tools/bitmaps/select_mousescale.bmp b/setup/data/tools/bitmaps/select_mousescale.bmp
deleted file mode 100644 (file)
index d8f3902..0000000
Binary files a/setup/data/tools/bitmaps/select_mousescale.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/select_mousescale.png b/setup/data/tools/bitmaps/select_mousescale.png
new file mode 100644 (file)
index 0000000..2ab67b2
Binary files /dev/null and b/setup/data/tools/bitmaps/select_mousescale.png differ
diff --git a/setup/data/tools/bitmaps/select_mousetranslate.bmp b/setup/data/tools/bitmaps/select_mousetranslate.bmp
deleted file mode 100644 (file)
index 04962fd..0000000
Binary files a/setup/data/tools/bitmaps/select_mousetranslate.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/select_mousetranslate.png b/setup/data/tools/bitmaps/select_mousetranslate.png
new file mode 100644 (file)
index 0000000..8d85268
Binary files /dev/null and b/setup/data/tools/bitmaps/select_mousetranslate.png differ
diff --git a/setup/data/tools/bitmaps/selection_csgmerge.bmp b/setup/data/tools/bitmaps/selection_csgmerge.bmp
deleted file mode 100644 (file)
index fb5df4f..0000000
Binary files a/setup/data/tools/bitmaps/selection_csgmerge.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_csgmerge.png b/setup/data/tools/bitmaps/selection_csgmerge.png
new file mode 100644 (file)
index 0000000..eabaecf
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_csgmerge.png differ
diff --git a/setup/data/tools/bitmaps/selection_csgsubtract.bmp b/setup/data/tools/bitmaps/selection_csgsubtract.bmp
deleted file mode 100644 (file)
index 267d374..0000000
Binary files a/setup/data/tools/bitmaps/selection_csgsubtract.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_csgsubtract.png b/setup/data/tools/bitmaps/selection_csgsubtract.png
new file mode 100644 (file)
index 0000000..71d9263
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_csgsubtract.png differ
diff --git a/setup/data/tools/bitmaps/selection_makehollow.bmp b/setup/data/tools/bitmaps/selection_makehollow.bmp
deleted file mode 100644 (file)
index d333e2e..0000000
Binary files a/setup/data/tools/bitmaps/selection_makehollow.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_makehollow.png b/setup/data/tools/bitmaps/selection_makehollow.png
new file mode 100644 (file)
index 0000000..5842690
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_makehollow.png differ
diff --git a/setup/data/tools/bitmaps/selection_makeroom.bmp b/setup/data/tools/bitmaps/selection_makeroom.bmp
deleted file mode 100644 (file)
index 1fcc788..0000000
Binary files a/setup/data/tools/bitmaps/selection_makeroom.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_makeroom.png b/setup/data/tools/bitmaps/selection_makeroom.png
new file mode 100644 (file)
index 0000000..8b44a8c
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_makeroom.png differ
diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall.bmp b/setup/data/tools/bitmaps/selection_selectcompletetall.bmp
deleted file mode 100644 (file)
index 8d2c104..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectcompletetall.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall.png b/setup/data/tools/bitmaps/selection_selectcompletetall.png
new file mode 100644 (file)
index 0000000..3f5813e
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_selectcompletetall.png differ
diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall_old.bmp b/setup/data/tools/bitmaps/selection_selectcompletetall_old.bmp
deleted file mode 100644 (file)
index 1f911e8..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectcompletetall_old.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selectcompletetall_old.png b/setup/data/tools/bitmaps/selection_selectcompletetall_old.png
new file mode 100644 (file)
index 0000000..3f55564
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_selectcompletetall_old.png differ
diff --git a/setup/data/tools/bitmaps/selection_selectinside.bmp b/setup/data/tools/bitmaps/selection_selectinside.bmp
deleted file mode 100644 (file)
index 12b22af..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectinside.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selectinside.png b/setup/data/tools/bitmaps/selection_selectinside.png
new file mode 100644 (file)
index 0000000..457805a
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_selectinside.png differ
diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall.bmp b/setup/data/tools/bitmaps/selection_selectpartialtall.bmp
deleted file mode 100644 (file)
index d21ddc2..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectpartialtall.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall.png b/setup/data/tools/bitmaps/selection_selectpartialtall.png
new file mode 100644 (file)
index 0000000..e378e47
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_selectpartialtall.png differ
diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall_old.bmp b/setup/data/tools/bitmaps/selection_selectpartialtall_old.bmp
deleted file mode 100644 (file)
index 77b418b..0000000
Binary files a/setup/data/tools/bitmaps/selection_selectpartialtall_old.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selectpartialtall_old.png b/setup/data/tools/bitmaps/selection_selectpartialtall_old.png
new file mode 100644 (file)
index 0000000..ab1dfc7
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_selectpartialtall_old.png differ
diff --git a/setup/data/tools/bitmaps/selection_selecttouching.bmp b/setup/data/tools/bitmaps/selection_selecttouching.bmp
deleted file mode 100644 (file)
index e6d5c4b..0000000
Binary files a/setup/data/tools/bitmaps/selection_selecttouching.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/selection_selecttouching.png b/setup/data/tools/bitmaps/selection_selecttouching.png
new file mode 100644 (file)
index 0000000..f4cf1c0
Binary files /dev/null and b/setup/data/tools/bitmaps/selection_selecttouching.png differ
diff --git a/setup/data/tools/bitmaps/shadernotex.bmp b/setup/data/tools/bitmaps/shadernotex.bmp
deleted file mode 100644 (file)
index 6be415e..0000000
Binary files a/setup/data/tools/bitmaps/shadernotex.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/shadernotex.png b/setup/data/tools/bitmaps/shadernotex.png
new file mode 100644 (file)
index 0000000..0eab827
Binary files /dev/null and b/setup/data/tools/bitmaps/shadernotex.png differ
diff --git a/setup/data/tools/bitmaps/show_entities.bmp b/setup/data/tools/bitmaps/show_entities.bmp
deleted file mode 100644 (file)
index 9188bee..0000000
Binary files a/setup/data/tools/bitmaps/show_entities.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/show_entities.png b/setup/data/tools/bitmaps/show_entities.png
new file mode 100644 (file)
index 0000000..97bc49b
Binary files /dev/null and b/setup/data/tools/bitmaps/show_entities.png differ
diff --git a/setup/data/tools/bitmaps/splash.bmp b/setup/data/tools/bitmaps/splash.bmp
deleted file mode 100644 (file)
index a484997..0000000
Binary files a/setup/data/tools/bitmaps/splash.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/splash.png b/setup/data/tools/bitmaps/splash.png
new file mode 100644 (file)
index 0000000..af09ccd
Binary files /dev/null and b/setup/data/tools/bitmaps/splash.png differ
diff --git a/setup/data/tools/bitmaps/texture_browser.bmp b/setup/data/tools/bitmaps/texture_browser.bmp
deleted file mode 100644 (file)
index 22f7250..0000000
Binary files a/setup/data/tools/bitmaps/texture_browser.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/texture_browser.png b/setup/data/tools/bitmaps/texture_browser.png
new file mode 100644 (file)
index 0000000..3c145c5
Binary files /dev/null and b/setup/data/tools/bitmaps/texture_browser.png differ
diff --git a/setup/data/tools/bitmaps/texture_lock.bmp b/setup/data/tools/bitmaps/texture_lock.bmp
deleted file mode 100644 (file)
index 0a003bc..0000000
Binary files a/setup/data/tools/bitmaps/texture_lock.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/texture_lock.png b/setup/data/tools/bitmaps/texture_lock.png
new file mode 100644 (file)
index 0000000..2a6c271
Binary files /dev/null and b/setup/data/tools/bitmaps/texture_lock.png differ
diff --git a/setup/data/tools/bitmaps/textures_popup.bmp b/setup/data/tools/bitmaps/textures_popup.bmp
deleted file mode 100644 (file)
index 5333382..0000000
Binary files a/setup/data/tools/bitmaps/textures_popup.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/textures_popup.png b/setup/data/tools/bitmaps/textures_popup.png
new file mode 100644 (file)
index 0000000..b238679
Binary files /dev/null and b/setup/data/tools/bitmaps/textures_popup.png differ
diff --git a/setup/data/tools/bitmaps/undo.bmp b/setup/data/tools/bitmaps/undo.bmp
deleted file mode 100644 (file)
index fd2b839..0000000
Binary files a/setup/data/tools/bitmaps/undo.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/undo.png b/setup/data/tools/bitmaps/undo.png
new file mode 100644 (file)
index 0000000..c0408dd
Binary files /dev/null and b/setup/data/tools/bitmaps/undo.png differ
diff --git a/setup/data/tools/bitmaps/view_cameratoggle.bmp b/setup/data/tools/bitmaps/view_cameratoggle.bmp
deleted file mode 100644 (file)
index 4ec79ed..0000000
Binary files a/setup/data/tools/bitmaps/view_cameratoggle.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_cameratoggle.png b/setup/data/tools/bitmaps/view_cameratoggle.png
new file mode 100644 (file)
index 0000000..375e3de
Binary files /dev/null and b/setup/data/tools/bitmaps/view_cameratoggle.png differ
diff --git a/setup/data/tools/bitmaps/view_cameraupdate.bmp b/setup/data/tools/bitmaps/view_cameraupdate.bmp
deleted file mode 100644 (file)
index dbb1195..0000000
Binary files a/setup/data/tools/bitmaps/view_cameraupdate.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_cameraupdate.png b/setup/data/tools/bitmaps/view_cameraupdate.png
new file mode 100644 (file)
index 0000000..62aa228
Binary files /dev/null and b/setup/data/tools/bitmaps/view_cameraupdate.png differ
diff --git a/setup/data/tools/bitmaps/view_change.bmp b/setup/data/tools/bitmaps/view_change.bmp
deleted file mode 100644 (file)
index 977ee1e..0000000
Binary files a/setup/data/tools/bitmaps/view_change.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_change.png b/setup/data/tools/bitmaps/view_change.png
new file mode 100644 (file)
index 0000000..e72238f
Binary files /dev/null and b/setup/data/tools/bitmaps/view_change.png differ
diff --git a/setup/data/tools/bitmaps/view_clipper.bmp b/setup/data/tools/bitmaps/view_clipper.bmp
deleted file mode 100644 (file)
index 606a209..0000000
Binary files a/setup/data/tools/bitmaps/view_clipper.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_clipper.png b/setup/data/tools/bitmaps/view_clipper.png
new file mode 100644 (file)
index 0000000..b006c0c
Binary files /dev/null and b/setup/data/tools/bitmaps/view_clipper.png differ
diff --git a/setup/data/tools/bitmaps/view_cubicclipping.bmp b/setup/data/tools/bitmaps/view_cubicclipping.bmp
deleted file mode 100644 (file)
index 16f7cb0..0000000
Binary files a/setup/data/tools/bitmaps/view_cubicclipping.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_cubicclipping.png b/setup/data/tools/bitmaps/view_cubicclipping.png
new file mode 100644 (file)
index 0000000..e01508a
Binary files /dev/null and b/setup/data/tools/bitmaps/view_cubicclipping.png differ
diff --git a/setup/data/tools/bitmaps/view_entity.bmp b/setup/data/tools/bitmaps/view_entity.bmp
deleted file mode 100644 (file)
index 851ec2c..0000000
Binary files a/setup/data/tools/bitmaps/view_entity.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/view_entity.png b/setup/data/tools/bitmaps/view_entity.png
new file mode 100644 (file)
index 0000000..4a29d90
Binary files /dev/null and b/setup/data/tools/bitmaps/view_entity.png differ
diff --git a/setup/data/tools/bitmaps/white.bmp b/setup/data/tools/bitmaps/white.bmp
deleted file mode 100644 (file)
index cbf038f..0000000
Binary files a/setup/data/tools/bitmaps/white.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/white.png b/setup/data/tools/bitmaps/white.png
new file mode 100644 (file)
index 0000000..4af01bd
Binary files /dev/null and b/setup/data/tools/bitmaps/white.png differ
diff --git a/setup/data/tools/bitmaps/window1.bmp b/setup/data/tools/bitmaps/window1.bmp
deleted file mode 100644 (file)
index a8913c7..0000000
Binary files a/setup/data/tools/bitmaps/window1.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/window1.png b/setup/data/tools/bitmaps/window1.png
new file mode 100644 (file)
index 0000000..c880b89
Binary files /dev/null and b/setup/data/tools/bitmaps/window1.png differ
diff --git a/setup/data/tools/bitmaps/window2.bmp b/setup/data/tools/bitmaps/window2.bmp
deleted file mode 100644 (file)
index 6db9e56..0000000
Binary files a/setup/data/tools/bitmaps/window2.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/window2.png b/setup/data/tools/bitmaps/window2.png
new file mode 100644 (file)
index 0000000..94e936c
Binary files /dev/null and b/setup/data/tools/bitmaps/window2.png differ
diff --git a/setup/data/tools/bitmaps/window3.bmp b/setup/data/tools/bitmaps/window3.bmp
deleted file mode 100644 (file)
index e81a299..0000000
Binary files a/setup/data/tools/bitmaps/window3.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/window3.png b/setup/data/tools/bitmaps/window3.png
new file mode 100644 (file)
index 0000000..e739968
Binary files /dev/null and b/setup/data/tools/bitmaps/window3.png differ
diff --git a/setup/data/tools/bitmaps/window4.bmp b/setup/data/tools/bitmaps/window4.bmp
deleted file mode 100644 (file)
index d753945..0000000
Binary files a/setup/data/tools/bitmaps/window4.bmp and /dev/null differ
diff --git a/setup/data/tools/bitmaps/window4.png b/setup/data/tools/bitmaps/window4.png
new file mode 100644 (file)
index 0000000..891ca41
Binary files /dev/null and b/setup/data/tools/bitmaps/window4.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.bmp
deleted file mode 100644 (file)
index 5223950..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.png b/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.png
new file mode 100644 (file)
index 0000000..0b99438
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_caulk.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.bmp
deleted file mode 100644 (file)
index 8939d5d..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.png b/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.png
new file mode 100644 (file)
index 0000000..a109ec1
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup_old.png b/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup_old.png
new file mode 100644 (file)
index 0000000..c4de5d1
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_cleanup_old.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.bmp
deleted file mode 100644 (file)
index 2fcdcba..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.png b/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.png
new file mode 100644 (file)
index 0000000..2210926
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_dropent.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_merge.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_merge.bmp
deleted file mode 100644 (file)
index 2184f7a..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_merge.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_merge.png b/setup/data/tools/plugins/bitmaps/bobtoolz_merge.png
new file mode 100644 (file)
index 0000000..5d2d8b3
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_merge.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_merge_old.png b/setup/data/tools/plugins/bitmaps/bobtoolz_merge_old.png
new file mode 100644 (file)
index 0000000..e50d4b1
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_merge_old.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_poly.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_poly.bmp
deleted file mode 100644 (file)
index e714f3b..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_poly.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_poly.png b/setup/data/tools/plugins/bitmaps/bobtoolz_poly.png
new file mode 100644 (file)
index 0000000..cfddeaa
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_poly.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_poly_old.png b/setup/data/tools/plugins/bitmaps/bobtoolz_poly_old.png
new file mode 100644 (file)
index 0000000..897cbcb
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_poly_old.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_split.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_split.bmp
deleted file mode 100644 (file)
index 7e1dc72..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_split.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_split.png b/setup/data/tools/plugins/bitmaps/bobtoolz_split.png
new file mode 100644 (file)
index 0000000..67547c9
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_split.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_split_old.png b/setup/data/tools/plugins/bitmaps/bobtoolz_split_old.png
new file mode 100644 (file)
index 0000000..5387ec2
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_split_old.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.bmp
deleted file mode 100644 (file)
index 3d47fdc..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.png b/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.png
new file mode 100644 (file)
index 0000000..271c612
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_splitcol.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.bmp
deleted file mode 100644 (file)
index 03b1ae3..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.png b/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.png
new file mode 100644 (file)
index 0000000..c8d2863
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_splitrow.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.bmp
deleted file mode 100644 (file)
index 66537dc..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.png b/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.png
new file mode 100644 (file)
index 0000000..4a1038a
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_trainpathplot.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.bmp
deleted file mode 100644 (file)
index 5c967ab..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.png b/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.png
new file mode 100644 (file)
index 0000000..c0d8765
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_treeplanter.png differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.bmp b/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.bmp
deleted file mode 100644 (file)
index b72cb2a..0000000
Binary files a/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.png b/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.png
new file mode 100644 (file)
index 0000000..20cbb41
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/bobtoolz_turnedge.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_actorclip.bmp b/setup/data/tools/plugins/bitmaps/ufoai_actorclip.bmp
deleted file mode 100644 (file)
index 4a2887c..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_actorclip.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_actorclip.png b/setup/data/tools/plugins/bitmaps/ufoai_actorclip.png
new file mode 100644 (file)
index 0000000..0412c95
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_actorclip.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level1.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level1.bmp
deleted file mode 100644 (file)
index 80a4b29..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level1.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level1.png b/setup/data/tools/plugins/bitmaps/ufoai_level1.png
new file mode 100644 (file)
index 0000000..d5a3979
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level1.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level2.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level2.bmp
deleted file mode 100644 (file)
index e84e254..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level2.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level2.png b/setup/data/tools/plugins/bitmaps/ufoai_level2.png
new file mode 100644 (file)
index 0000000..7f07a02
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level2.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level3.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level3.bmp
deleted file mode 100644 (file)
index 141c324..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level3.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level3.png b/setup/data/tools/plugins/bitmaps/ufoai_level3.png
new file mode 100644 (file)
index 0000000..7b3f1e3
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level3.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level4.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level4.bmp
deleted file mode 100644 (file)
index 3783a80..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level4.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level4.png b/setup/data/tools/plugins/bitmaps/ufoai_level4.png
new file mode 100644 (file)
index 0000000..6801aae
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level4.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level5.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level5.bmp
deleted file mode 100644 (file)
index 8f62851..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level5.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level5.png b/setup/data/tools/plugins/bitmaps/ufoai_level5.png
new file mode 100644 (file)
index 0000000..48a9294
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level5.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level6.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level6.bmp
deleted file mode 100644 (file)
index 418fdd2..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level6.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level6.png b/setup/data/tools/plugins/bitmaps/ufoai_level6.png
new file mode 100644 (file)
index 0000000..eab3b50
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level6.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level7.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level7.bmp
deleted file mode 100644 (file)
index d82dab6..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level7.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level7.png b/setup/data/tools/plugins/bitmaps/ufoai_level7.png
new file mode 100644 (file)
index 0000000..bfb85a7
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level7.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level8.bmp b/setup/data/tools/plugins/bitmaps/ufoai_level8.bmp
deleted file mode 100644 (file)
index c380953..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_level8.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_level8.png b/setup/data/tools/plugins/bitmaps/ufoai_level8.png
new file mode 100644 (file)
index 0000000..686d8b1
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_level8.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_nodraw.bmp b/setup/data/tools/plugins/bitmaps/ufoai_nodraw.bmp
deleted file mode 100644 (file)
index 3eaa529..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_nodraw.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_nodraw.png b/setup/data/tools/plugins/bitmaps/ufoai_nodraw.png
new file mode 100644 (file)
index 0000000..5dbf903
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_nodraw.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_stepon.bmp b/setup/data/tools/plugins/bitmaps/ufoai_stepon.bmp
deleted file mode 100644 (file)
index b73896f..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_stepon.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_stepon.png b/setup/data/tools/plugins/bitmaps/ufoai_stepon.png
new file mode 100644 (file)
index 0000000..7ad5d5b
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_stepon.png differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.bmp b/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.bmp
deleted file mode 100644 (file)
index 799468b..0000000
Binary files a/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.bmp and /dev/null differ
diff --git a/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.png b/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.png
new file mode 100644 (file)
index 0000000..d1fea27
Binary files /dev/null and b/setup/data/tools/plugins/bitmaps/ufoai_weaponclip.png differ