Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-06 13:08:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

feat(browser): implement select file dialog

Browse source
This commit is contained in:
OJ Kwon 2018-03-30 12:03:43 -07:00
parent 2071245e5f
commit 4125b54c0d
No known key found for this signature in database
GPG key ID: 6C23A45602A44DA6
1 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

32
ports/servo/browser.rs
View file

@ -10,6 +10,7 @@ use servo::compositing::windowing::{WebRenderDebugOption, WindowEvent};
use servo::ipc_channel::ipc::IpcSender;
use servo::msg::constellation_msg::{Key, TopLevelBrowsingContextId as BrowserId};
use servo::msg::constellation_msg::{KeyModifiers, KeyState, TraversalDirection};
use servo::net_traits::filemanager_thread::FilterPattern;
use servo::net_traits::pub_domains::is_reg_domain;
use servo::script_traits::TouchEventType;
use servo::servo_config::prefs::PREFS;
@ -17,7 +18,6 @@ use servo::servo_url::ServoUrl;
use servo::webrender_api::ScrollLocation;
use std::mem;
use std::rc::Rc;
#[cfg(target_os = "linux")]
use std::thread;
use tinyfiledialogs;
@ -296,6 +296,7 @@ impl Browser {
platform_get_selected_devices(devices, sender);
},
EmbedderMsg::GetSelectedFiles(patterns, multiple_files, sender) => {
platform_get_selected_files(patterns, multiple_files, sender);
}
EmbedderMsg::ShowIME(_browser_id, _kind) => {
debug!("ShowIME received");
@ -342,6 +343,35 @@ fn platform_get_selected_devices(devices: Vec<String>, sender: IpcSender<Option<
let _ = sender.send(None);
}
#[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
fn platform_get_selected_files(patterns: Vec<FilterPattern>, multiple_files: bool, sender: IpcSender<Option<Vec<String>>>) {
let picker_name = if multiple_files { "Pick files" } else { "Pick a file" };
thread::Builder::new().name(picker_name.to_owned()).spawn(move || {
let mut filter = vec![];
for p in patterns {
let s = "*.".to_string() + &p.0;
filter.push(s)
}
let filter_ref = &(filter.iter().map(|s| s.as_str()).collect::<Vec<&str>>()[..]);
let filter_opt = if filter.len() > 0 { Some((filter_ref, "")) } else { None };
if multiple_files {
let files = tinyfiledialogs::open_file_dialog_multi(picker_name, "", filter_opt);
let _ = sender.send(files);
} else {
let file = tinyfiledialogs::open_file_dialog(picker_name, "", filter_opt);
let _ = sender.send(file.map(|x| vec![x]));
}
}).expect("Thread spawning failed");
}
#[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
fn platform_get_selected_files(_patterns: Vec<FilterPattern>, _multiple_files: bool, sender: IpcSender<Option<Vec<String>>>) {
sender.send(None);
}
fn sanitize_url(request: &str) -> Option<ServoUrl> {
let request = request.trim();
ServoUrl::parse(&request).ok()