X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=contrib%2Fbobtoolz%2FbobToolz-GTK.cpp;h=c1ac8b1de987cc0c18268b9de520caafcc5caa47;hb=2f3014d79f98abd19b003327ed7852e8246e0a1e;hp=898c94cb00f63357d8c9d34ee144b47d779b88ed;hpb=ecf144c9acc4e8e5bc6d79d8402f0c4e31f4f5a1;p=xonotic%2Fnetradiant.git

diff --git a/contrib/bobtoolz/bobToolz-GTK.cpp b/contrib/bobtoolz/bobToolz-GTK.cpp
index 898c94cb..c1ac8b1d 100644
--- a/contrib/bobtoolz/bobToolz-GTK.cpp
+++ b/contrib/bobtoolz/bobToolz-GTK.cpp
@@ -163,7 +163,7 @@ const char* QERPlug_GetCommandTitleList(){
 }
 
 
-const int NUM_TOOLBARBUTTONS = 14;
+const int NUM_TOOLBARBUTTONS = 13;
 
 std::size_t ToolbarButtonCount( void ) {
 	return NUM_TOOLBARBUTTONS;
@@ -176,27 +176,27 @@ virtual const char* getImage() const {
 	switch ( mIndex ) {
 	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.png";
-	case 5: return "bobtoolz_trainpathplot.png";
-	case 6: return "bobtoolz_dropent.png";
-	case 7: return "";
-	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.png";
+//	case 2: return "bobtoolz_caulk.png";
+	case 2: return "";
+	case 3: return "bobtoolz_treeplanter.png";
+	case 4: return "bobtoolz_trainpathplot.png";
+	case 5: return "bobtoolz_dropent.png";
+	case 6: return "";
+	case 7: return "bobtoolz_merge.png";
+	case 8: return "bobtoolz_split.png";
+	case 9: return "bobtoolz_splitrow.png";
+	case 10: return "bobtoolz_splitcol.png";
+	case 11: return "";
+	case 12: return "bobtoolz_turnedge.png";
 	}
 	return NULL;
 }
 virtual EType getType() const {
 	switch ( mIndex ) {
-	case 3: return eSpace;
-	case 4: return eToggleButton;
-	case 7: return eSpace;
-	case 12: return eSpace;
+	case 2: return eSpace;
+	case 3: return eToggleButton;
+	case 6: return eSpace;
+	case 11: return eSpace;
 	default: return eButton;
 	}
 }
@@ -204,15 +204,15 @@ virtual const char* getText() const {
 	switch ( mIndex ) {
 	case 0: return "Cleanup";
 	case 1: return "Polygons";
-	case 2: return "Caulk";
-	case 4: return "Tree Planter";
-	case 5: return "Plot Splines";
-	case 6: return "Drop Entity";
-	case 8: return "Merge 2 Patches";
-	case 9: return "Split Patch";
-	case 10: return "Split Patch Rows";
-	case 11: return "Split Patch Columns";
-	case 13: return "Flip Terrain";
+//	case 2: return "Caulk";
+	case 3: return "Tree Planter";
+	case 4: return "Plot Splines";
+	case 5: return "Drop Entity";
+	case 7: return "Merge 2 Patches";
+	case 8: return "Split Patch";
+	case 9: return "Split Patch Rows";
+	case 10: return "Split Patch Columns";
+	case 12: return "Flip Terrain";
 	}
 	return NULL;
 }
@@ -220,15 +220,15 @@ virtual const char* getTooltip() const {
 	switch ( mIndex ) {
 	case 0: return "Brush Cleanup";
 	case 1: return "Polygons";
-	case 2: return "Caulk selection";
-	case 4: return "Tree Planter";
-	case 5: return "Plot Splines";
-	case 6: return "Drop Entity";
-	case 8: return "Merge 2 Patches";
-	case 9: return "Split Patch";
-	case 10: return "Split Patch Rows";
-	case 11: return "Split Patch Columns";
-	case 13: return "Flip Terrain (Turn Edge)";
+//	case 2: return "Caulk selection";
+	case 3: return "Tree Planter";
+	case 4: return "Plot Splines";
+	case 5: return "Drop Entity";
+	case 7: return "Merge 2 Patches";
+	case 8: return "Split Patch";
+	case 9: return "Split Patch Rows";
+	case 10: return "Split Patch Columns";
+	case 12: return "Flip Terrain (Turn Edge)";
 	}
 	return NULL;
 }
@@ -239,15 +239,15 @@ virtual void activate() const {
 	switch ( mIndex ) {
 	case 0: DoFixBrushes(); break;
 	case 1: DoPolygonsTB(); break;
-	case 2: DoCaulkSelection(); break;
-	case 4: DoTreePlanter(); break;
-	case 5: DoTrainPathPlot(); break;
-	case 6: DoDropEnts(); break;
-	case 8: DoMergePatches(); break;
-	case 9: DoSplitPatch(); break;
-	case 10: DoSplitPatchRows(); break;
-	case 11: DoSplitPatchCols(); break;
-	case 13: DoFlipTerrain(); break;
+//	case 2: DoCaulkSelection(); break;
+	case 3: DoTreePlanter(); break;
+	case 4: DoTrainPathPlot(); break;
+	case 5: DoDropEnts(); break;
+	case 7: DoMergePatches(); break;
+	case 8: DoSplitPatch(); break;
+	case 9: DoSplitPatchRows(); break;
+	case 10: DoSplitPatchCols(); break;
+	case 12: DoFlipTerrain(); break;
 	}
 }