Reorder tool icons, update favicon and logo, and other icon cleanup

editor/src/viewport_tools/tool.rs

@@ -77,19 +77,15 @@ impl Default for ToolFsmState {
 			tool_data: ToolData {
 				active_tool_type: ToolType::Select,
 				tools: gen_tools_hash_map! {
+					// General
 					Select => select_tool::SelectTool,
 					Crop => crop_tool::CropTool,
 					Navigate => navigate_tool::NavigateTool,
 					Eyedropper => eyedropper_tool::EyedropperTool,
-					Text => text_tool::TextTool,
 					Fill => fill_tool::FillTool,
 					Gradient => gradient_tool::GradientTool,
-					// Brush => brush_tool::BrushTool,
-					// Heal => heal_tool::HealTool,
-					// Clone => clone_tool:::CloneTool,
-					// Patch => patch_tool:::PatchTool,
-					// BlurSharpen => blursharpen_tool:::BlurSharpenTool,
-					// Relight => relight_tool:::RelightTool,
+
+					// Vector
 					Path => path_tool::PathTool,
 					Pen => pen_tool::PenTool,
 					Freehand => freehand_tool::FreehandTool,
@@ -98,6 +94,15 @@ impl Default for ToolFsmState {
 					Rectangle => rectangle_tool::RectangleTool,
 					Ellipse => ellipse_tool::EllipseTool,
 					Shape => shape_tool::ShapeTool,
+					Text => text_tool::TextTool,
+
+					// Raster
+					// Brush => brush_tool::BrushTool,
+					// Heal => heal_tool::HealTool,
+					// Clone => clone_tool:::CloneTool,
+					// Patch => patch_tool:::PatchTool,
+					// Relight => relight_tool:::RelightTool,
+					// Detail => detail_tool:::DetailTool,
 				},
 			},
 			document_tool_data: DocumentToolData {
@@ -132,7 +137,7 @@ pub enum ToolType {
 	Heal,
 	Clone,
 	Patch,
-	BlurSharpen,
+	Detail,
 	Relight,
 	Path,
 	Pen,
@@ -160,7 +165,7 @@ impl fmt::Display for ToolType {
 			Heal,
 			Clone,
 			Patch,
-			BlurSharpen,
+			Detail,
 			Relight,
 			Path,
 			Pen,
@@ -193,12 +198,12 @@ pub fn standard_tool_message(tool: ToolType, message_type: StandardToolMessageTy
 			ToolType::Text => Some(TextMessage::DocumentIsDirty.into()),
 			ToolType::Fill => None, // Some(FillToolMessage::DocumentIsDirty.into()),
 			ToolType::Gradient => Some(GradientToolMessage::DocumentIsDirty.into()),
-			ToolType::Brush => None,       // Some(BrushMessage::DocumentIsDirty.into()),
-			ToolType::Heal => None,        // Some(HealMessage::DocumentIsDirty.into()),
-			ToolType::Clone => None,       // Some(CloneMessage::DocumentIsDirty.into()),
-			ToolType::Patch => None,       // Some(PatchMessage::DocumentIsDirty.into()),
-			ToolType::BlurSharpen => None, // Some(BlurSharPenToolMessage::DocumentIsDirty.into()),
-			ToolType::Relight => None,     // Some(RelightMessage::DocumentIsDirty.into()),
+			ToolType::Brush => None,   // Some(BrushMessage::DocumentIsDirty.into()),
+			ToolType::Heal => None,    // Some(HealMessage::DocumentIsDirty.into()),
+			ToolType::Clone => None,   // Some(CloneMessage::DocumentIsDirty.into()),
+			ToolType::Patch => None,   // Some(PatchMessage::DocumentIsDirty.into()),
+			ToolType::Detail => None,  // Some(DetailToolMessage::DocumentIsDirty.into()),
+			ToolType::Relight => None, // Some(RelightMessage::DocumentIsDirty.into()),
 			ToolType::Path => Some(PathToolMessage::DocumentIsDirty.into()),
 			ToolType::Pen => Some(PenToolMessage::DocumentIsDirty.into()),
 			ToolType::Freehand => None,  // Some(FreehandToolMessage::DocumentIsDirty.into()),
@@ -220,7 +225,7 @@ pub fn standard_tool_message(tool: ToolType, message_type: StandardToolMessageTy
 			// ToolType::Heal => Some(HealMessage::Abort.into()),
 			// ToolType::Clone => Some(CloneMessage::Abort.into()),
 			// ToolType::Patch => Some(PatchMessage::Abort.into()),
-			// ToolType::BlurSharpen => Some(BlurSharPenToolMessage::Abort.into()),
+			// ToolType::Detail => Some(DetailToolMessage::Abort.into()),
 			// ToolType::Relight => Some(RelightMessage::Abort.into()),
 			ToolType::Path => Some(PathToolMessage::Abort.into()),
 			ToolType::Pen => Some(PenToolMessage::Abort.into()),
@@ -254,7 +259,7 @@ pub fn message_to_tool_type(message: &ToolMessage) -> ToolType {
 		// Heal(_) => ToolType::Heal,
 		// Clone(_) => ToolType::Clone,
 		// Patch(_) => ToolType::Patch,
-		// BlurSharpen(_) => ToolType::BlurSharpen,
+		// Detail(_) => ToolType::Detail,
 		// Relight(_) => ToolType::Relight,
 		Path(_) => ToolType::Path,
 		Pen(_) => ToolType::Pen,

editor/src/viewport_tools/tool_message.rs

@@ -22,36 +22,12 @@ pub enum ToolMessage {
 	#[remain::unsorted]
 	#[child]
 	Eyedropper(EyedropperToolMessage),
-	// #[remain::unsorted]
-	// #[child]
-	// Text(TextMessage),
-	#[remain::unsorted]
-	#[child]
-	Text(TextMessage),
 	#[remain::unsorted]
 	#[child]
 	Fill(FillToolMessage),
 	#[remain::unsorted]
 	#[child]
 	Gradient(GradientToolMessage),
-	// #[remain::unsorted]
-	// #[child]
-	// Brush(BrushToolMessage),
-	// #[remain::unsorted]
-	// #[child]
-	// Heal(HealToolMessage),
-	// #[remain::unsorted]
-	// #[child]
-	// Clone(CloneToolMessage),
-	// #[remain::unsorted]
-	// #[child]
-	// Patch(PatchToolMessage),
-	// #[remain::unsorted]
-	// #[child]
-	// Detail(DetailToolMessage),
-	// #[remain::unsorted]
-	// #[child]
-	// Relight(RelightToolMessage),
 	#[remain::unsorted]
 	#[child]
 	Path(PathToolMessage),
@@ -76,6 +52,27 @@ pub enum ToolMessage {
 	#[remain::unsorted]
 	#[child]
 	Shape(ShapeToolMessage),
+	#[remain::unsorted]
+	#[child]
+	Text(TextMessage),
+	// #[remain::unsorted]
+	// #[child]
+	// Brush(BrushToolMessage),
+	// #[remain::unsorted]
+	// #[child]
+	// Heal(HealToolMessage),
+	// #[remain::unsorted]
+	// #[child]
+	// Clone(CloneToolMessage),
+	// #[remain::unsorted]
+	// #[child]
+	// Patch(PatchToolMessage),
+	// #[remain::unsorted]
+	// #[child]
+	// Relight(RelightToolMessage),
+	// #[remain::unsorted]
+	// #[child]
+	// Detail(DetailToolMessage),
 
 	// Messages
 	#[remain::unsorted]