aboutsummaryrefslogtreecommitdiffstats
path: root/components/net
diff options
context:
space:
mode:
authorUK992 <urbankrajnc92@gmail.com>2016-07-25 14:43:06 +0200
committerUK992 <urbankrajnc92@gmail.com>2016-07-25 14:43:06 +0200
commit06142b37b85371d92005ee38da7e6c752ab43be8 (patch)
tree3017730e5bae175b205480f2e9cddbd128346a1d /components/net
parent521f8c013524b64daefc9c34c46263868f902de4 (diff)
downloadservo-06142b37b85371d92005ee38da7e6c752ab43be8.tar.gz
servo-06142b37b85371d92005ee38da7e6c752ab43be8.zip
Support tinyfiledialogs on Windows
Diffstat (limited to 'components/net')
-rw-r--r--components/net/Cargo.toml2
-rw-r--r--components/net/filemanager_thread.rs14
-rw-r--r--components/net/http_loader.rs6
-rw-r--r--components/net/lib.rs2
4 files changed, 12 insertions, 12 deletions
diff --git a/components/net/Cargo.toml b/components/net/Cargo.toml
index 9cb6ecfc5de..50b160130c2 100644
--- a/components/net/Cargo.toml
+++ b/components/net/Cargo.toml
@@ -46,5 +46,5 @@ git = "https://github.com/servo/webrender_traits"
default_features = false
features = ["serde_macros"]
-[target.'cfg(any(target_os = "macos", target_os = "linux"))'.dependencies]
+[target.'cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))'.dependencies]
tinyfiledialogs = {git = "https://github.com/jdm/tinyfiledialogs"}
diff --git a/components/net/filemanager_thread.rs b/components/net/filemanager_thread.rs
index 175d1ca3fe1..3b824759624 100644
--- a/components/net/filemanager_thread.rs
+++ b/components/net/filemanager_thread.rs
@@ -14,7 +14,7 @@ use std::ops::Index;
use std::path::{Path, PathBuf};
use std::sync::atomic::{self, AtomicUsize, AtomicBool, Ordering};
use std::sync::{Arc, RwLock};
-#[cfg(any(target_os = "macos", target_os = "linux"))]
+#[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
use tinyfiledialogs;
use url::Url;
use util::prefs::PREFS;
@@ -37,7 +37,7 @@ pub trait UIProvider where Self: Sync {
pub struct TFDProvider;
impl UIProvider for TFDProvider {
- #[cfg(any(target_os = "macos", target_os = "linux"))]
+ #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
fn open_file_dialog(&self, path: &str, patterns: Vec<FilterPattern>) -> Option<String> {
let mut filter = vec![];
for p in patterns {
@@ -52,7 +52,7 @@ impl UIProvider for TFDProvider {
tinyfiledialogs::open_file_dialog("Pick a file", path, filter_opt)
}
- #[cfg(any(target_os = "macos", target_os = "linux"))]
+ #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
fn open_file_dialog_multi(&self, path: &str, patterns: Vec<FilterPattern>) -> Option<Vec<String>> {
let mut filter = vec![];
for p in patterns {
@@ -67,13 +67,13 @@ impl UIProvider for TFDProvider {
tinyfiledialogs::open_file_dialog_multi("Pick files", path, filter_opt)
}
- #[cfg(not(any(target_os = "macos", target_os = "linux")))]
- fn open_file_dialog(&self, path: &str, patterns: Vec<FilterPattern>) -> Option<String> {
+ #[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
+ fn open_file_dialog(&self, _path: &str, _patterns: Vec<FilterPattern>) -> Option<String> {
None
}
- #[cfg(not(any(target_os = "macos", target_os = "linux")))]
- fn open_file_dialog_multi(&self, path: &str, patterns: Vec<FilterPattern>) -> Option<Vec<String>> {
+ #[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
+ fn open_file_dialog_multi(&self, _path: &str, _patterns: Vec<FilterPattern>) -> Option<Vec<String>> {
None
}
}
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index a39d284a486..a144721ff27 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -48,7 +48,7 @@ use std::sync::mpsc::Sender;
use std::sync::{Arc, RwLock};
use time;
use time::Tm;
-#[cfg(any(target_os = "macos", target_os = "linux"))]
+#[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
use tinyfiledialogs;
use url::{Url, Position};
use util::prefs::PREFS;
@@ -843,13 +843,13 @@ pub trait UIProvider {
}
impl UIProvider for TFDProvider {
- #[cfg(any(target_os = "macos", target_os = "linux"))]
+ #[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
fn input_username_and_password(&self, prompt: &str) -> (Option<String>, Option<String>) {
(tinyfiledialogs::input_box(prompt, "Username:", ""),
tinyfiledialogs::input_box(prompt, "Password:", ""))
}
- #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+ #[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
fn input_username_and_password(&self, _prompt: &str) -> (Option<String>, Option<String>) {
(None, None)
}
diff --git a/components/net/lib.rs b/components/net/lib.rs
index 80c6294c277..53efb84f6c2 100644
--- a/components/net/lib.rs
+++ b/components/net/lib.rs
@@ -38,7 +38,7 @@ extern crate rand;
extern crate rustc_serialize;
extern crate threadpool;
extern crate time;
-#[cfg(any(target_os = "macos", target_os = "linux"))]
+#[cfg(any(target_os = "macos", target_os = "linux", target_os = "windows"))]
extern crate tinyfiledialogs;
extern crate unicase;
extern crate url;