Rename tools: "Sample" to "Eyedropper", "Blur/Sharpen" to "Detail" (#87)

README.md

@@ -53,7 +53,7 @@ We are also focusing initial feature development on a destructive SVG vector edi
 - Tool system
 - Tools: Line, rectangle, ellipse, and shape
 - Tools: Pen and path
-- Tools: Select, crop, navigate, sample
+- Tools: Select, crop, navigate, eyedropper
 - SVG import and export
 
 ## Technology stack

client/web/src/components/panels/Document.vue

@@ -52,7 +52,7 @@
 					<ShelfItem title="Select Tool (V)" :active="activeTool === 'Select'" @click="selectTool('Select')"><SelectTool /></ShelfItem>
 					<ShelfItem title="Crop Tool" :active="activeTool === 'Crop'" @click="'tool not implemented' || selectTool('Crop')"><CropTool /></ShelfItem>
 					<ShelfItem title="Navigate Tool" :active="activeTool === 'Navigate'" @click="'tool not implemented' || selectTool('Navigate')"><NavigateTool /></ShelfItem>
-					<ShelfItem title="Sample Tool" :active="activeTool === 'Sample'" @click="'tool not implemented' || selectTool('Sample')"><SampleTool /></ShelfItem>
+					<ShelfItem title="Eyedropper Tool" :active="activeTool === 'Eyedropper'" @click="'tool not implemented' || selectTool('Eyedropper')"><EyedropperTool /></ShelfItem>
 
 					<ItemDivider horizontal />
 
@@ -66,7 +66,7 @@
 					<ShelfItem title="Heal Tool" :active="activeTool === 'Heal'" @click="'tool not implemented' || selectTool('Heal')"><HealTool /></ShelfItem>
 					<ShelfItem title="Clone Tool" :active="activeTool === 'Clone'" @click="'tool not implemented' || selectTool('Clone')"><CloneTool /></ShelfItem>
 					<ShelfItem title="Patch Tool" :active="activeTool === 'Patch'" @click="'tool not implemented' || selectTool('Patch')"><PatchTool /></ShelfItem>
-					<ShelfItem title="Blur/Sharpen Tool" :active="activeTool === 'BlurSharpen'" @click="'tool not implemented' || selectTool('BlurSharpen')"><BlurSharpenTool /></ShelfItem>
+					<ShelfItem title="Detail Tool" :active="activeTool === 'BlurSharpen'" @click="'tool not implemented' || selectTool('BlurSharpen')"><BlurSharpenTool /></ShelfItem>
 					<ShelfItem title="Relight Tool" :active="activeTool === 'Relight'" @click="'tool not implemented' || selectTool('Relight')"><RelightTool /></ShelfItem>
 
 					<ItemDivider horizontal />
@@ -198,7 +198,7 @@ import ResetColorsButton from "../../../assets/svg/16x16-bounds-12x12-icon/reset
 import SelectTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-layout-select.svg";
 import CropTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-layout-crop.svg";
 import NavigateTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-layout-navigate.svg";
-import SampleTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-layout-sample.svg";
+import EyedropperTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-layout-eyedropper.svg";
 import TextTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-parametric-text.svg";
 import FillTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-parametric-fill.svg";
 import GradientTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-parametric-gradient.svg";
@@ -206,7 +206,7 @@ import BrushTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool
 import HealTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-raster-heal.svg";
 import CloneTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-raster-clone.svg";
 import PatchTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-raster-patch.svg";
-import BlurSharpenTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-raster-blur-sharpen.svg";
+import BlurSharpenTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-raster-detail.svg";
 import RelightTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-raster-relight.svg";
 import PathTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-vector-path.svg";
 import PenTool from "../../../assets/svg/24x24-bounds-24x24-icon/document-tool-vector-pen.svg";
@@ -253,7 +253,7 @@ export default defineComponent({
 		SelectTool,
 		CropTool,
 		NavigateTool,
-		SampleTool,
+		EyedropperTool,
 		TextTool,
 		FillTool,
 		GradientTool,

client/web/wasm/Cargo.toml

@@ -18,7 +18,7 @@ default = ["console_error_panic_hook"]
 [dependencies]
 console_error_panic_hook = { version = "0.1.6", optional = true }
 editor-core = { path = "../../../core/editor", package = "graphite-editor-core" }
-wasm-bindgen = "0.2.72"
+wasm-bindgen = "0.2.73"
 log = "0.4"
 
 [dev-dependencies]

client/web/wasm/src/wrappers.rs

@@ -42,7 +42,7 @@ pub fn translate_tool(name: &str) -> Option<ToolType> {
 		Select,
 		Crop,
 		Navigate,
-		Sample,
+		Eyedropper,
 		Text,
 		Fill,
 		Gradient,

core/editor/src/tools/eyedropper.rs

@@ -6,9 +6,9 @@ use document_core::Operation;
 use super::DocumentToolData;
 
 #[derive(Default)]
-pub struct Sample;
+pub struct Eyedropper;
 
-impl Tool for Sample {
+impl Tool for Eyedropper {
 	fn handle_input(&mut self, event: &Event, document: &Document, tool_data: &DocumentToolData) -> (Vec<Response>, Vec<Operation>) {
 		todo!("{}::handle_input {:?} {:?} {:?}", module_path!(), event, document, tool_data)
 	}

core/editor/src/tools/mod.rs

@@ -1,11 +1,11 @@
 mod crop;
 mod ellipse;
+mod eyedropper;
 mod line;
 mod navigate;
 mod path;
 mod pen;
 mod rectangle;
-mod sample;
 mod select;
 mod shape;
 
@@ -61,7 +61,7 @@ impl Default for ToolFsmState {
 					Select => select::Select,
 					Crop => crop::Crop,
 					Navigate => navigate::Navigate,
-					Sample => sample::Sample,
+					Eyedropper => eyedropper::Eyedropper,
 					Path => path::Path,
 					Pen => pen::Pen,
 					Line => line::Line,
@@ -114,7 +114,7 @@ pub enum ToolType {
 	Select,
 	Crop,
 	Navigate,
-	Sample,
+	Eyedropper,
 	Text,
 	Fill,
 	Gradient,
@@ -142,7 +142,7 @@ impl fmt::Display for ToolType {
 			Select,
 			Crop,
 			Navigate,
-			Sample,
+			Eyedropper,
 			Text,
 			Fill,
 			Gradient,