Implement File > Import and fix Ctrl+O to Open hotkey

Closes #671

editor/src/document/menu_bar_message_handler.rs

@@ -129,6 +129,7 @@ impl PropertyHolder for MenuBarMessageHandler {
 						MenuEntry {
 							label: "Import…".into(),
 							shortcut: Some(vec![Key::KeyControl, Key::KeyI]),
+							action: MenuEntry::create_action(|_| PortfolioMessage::Import.into()),
 							..MenuEntry::default()
 						},
 						MenuEntry {

editor/src/document/portfolio_message.rs

@@ -45,6 +45,7 @@ pub enum PortfolioMessage {
 		data: Vec<u8>,
 		is_default: bool,
 	},
+	Import,
 	LoadFont {
 		font: Font,
 		is_default: bool,

editor/src/document/portfolio_message_handler.rs

@@ -267,6 +267,12 @@ impl MessageHandler<PortfolioMessage, &InputPreprocessorMessageHandler> for Port
 					responses.push_back(DocumentMessage::RenderDocument.into());
 				}
 			}
+			Import => {
+				// This portfolio message wraps the frontend message so it can be listed as an action, which isn't possible for frontend messages
+				if self.active_document().is_some() {
+					responses.push_back(FrontendMessage::TriggerImport.into());
+				}
+			}
 			LoadFont { font, is_default } => {
 				if !self.font_cache.loaded_font(&font) {
 					responses.push_front(FrontendMessage::TriggerFontLoad { font, is_default }.into());
@@ -292,7 +298,8 @@ impl MessageHandler<PortfolioMessage, &InputPreprocessorMessageHandler> for Port
 				}
 			}
 			OpenDocument => {
-				responses.push_back(FrontendMessage::TriggerFileUpload.into());
+				// This portfolio message wraps the frontend message so it can be listed as an action, which isn't possible for frontend messages
+				responses.push_back(FrontendMessage::TriggerOpenDocument.into());
 			}
 			OpenDocumentFile {
 				document_name,
@@ -493,10 +500,12 @@ impl MessageHandler<PortfolioMessage, &InputPreprocessorMessageHandler> for Port
 		let mut common = actions!(PortfolioMessageDiscriminant;
 			CloseActiveDocumentWithConfirmation,
 			CloseAllDocuments,
+			Import,
 			NextDocument,
-			PrevDocument,
-			PasteIntoFolder,
+			OpenDocument,
 			Paste,
+			PasteIntoFolder,
+			PrevDocument,
 		);
 
 		if let Some(document) = self.active_document() {

editor/src/frontend/frontend_message.rs

@@ -24,10 +24,11 @@ pub enum FrontendMessage {
 	// Trigger prefix: cause a browser API to do something
 	TriggerAboutGraphiteLocalizedCommitDate { commit_date: String },
 	TriggerFileDownload { document: String, name: String },
-	TriggerFileUpload,
 	TriggerFontLoad { font: Font, is_default: bool },
+	TriggerImport,
 	TriggerIndexedDbRemoveDocument { document_id: u64 },
 	TriggerIndexedDbWriteDocument { document: String, details: FrontendDocumentDetails, version: String },
+	TriggerOpenDocument,
 	TriggerPaste,
 	TriggerRasterDownload { document: String, name: String, mime: String, size: (f64, f64) },
 	TriggerRefreshBoundsOfViewports,

editor/src/input/input_mapper.rs

@@ -145,8 +145,6 @@ impl Default for Mapping {
 			entry! {action=ToolMessage::ResetColors, key_down=KeyX, modifiers=[KeyShift, KeyControl]},
 			entry! {action=ToolMessage::SwapColors, key_down=KeyX, modifiers=[KeyShift]},
 			entry! {action=ToolMessage::SelectRandomPrimaryColor, key_down=KeyC, modifiers=[KeyAlt]},
-			// Editor Actions
-			entry! {action=FrontendMessage::TriggerFileUpload, key_down=KeyO, modifiers=[KeyControl]},
 			// Document actions
 			entry! {action=DocumentMessage::Redo, key_down=KeyZ, modifiers=[KeyControl, KeyShift]},
 			entry! {action=DocumentMessage::Undo, key_down=KeyZ, modifiers=[KeyControl]},
@@ -187,6 +185,8 @@ impl Default for Mapping {
 			entry! {action=MovementMessage::TranslateCanvasByViewportFraction { delta: DVec2::new(0., 1.) }, key_down=KeyPageUp},
 			entry! {action=MovementMessage::TranslateCanvasByViewportFraction { delta: DVec2::new(0., -1.) }, key_down=KeyPageDown},
 			// Portfolio actions
+			entry! {action=PortfolioMessage::OpenDocument, key_down=KeyO, modifiers=[KeyControl]},
+			entry! {action=PortfolioMessage::Import, key_down=KeyI, modifiers=[KeyControl]},
 			entry! {action=DialogMessage::RequestNewDocumentDialog, key_down=KeyN, modifiers=[KeyControl]},
 			entry! {action=PortfolioMessage::NextDocument, key_down=KeyTab, modifiers=[KeyControl]},
 			entry! {action=PortfolioMessage::PrevDocument, key_down=KeyTab, modifiers=[KeyControl, KeyShift]},