Open downloads from command bar
This commit is contained in:
@@ -12,6 +12,7 @@ actions!(
|
|||||||
[
|
[
|
||||||
CloseCurrentTab,
|
CloseCurrentTab,
|
||||||
FocusAddressBar,
|
FocusAddressBar,
|
||||||
|
OpenDownloads,
|
||||||
OpenNewTab,
|
OpenNewTab,
|
||||||
Quit,
|
Quit,
|
||||||
RestoreClosedTab,
|
RestoreClosedTab,
|
||||||
@@ -29,6 +30,8 @@ fn main() {
|
|||||||
cx.bind_keys([
|
cx.bind_keys([
|
||||||
KeyBinding::new("cmd-t", OpenNewTab, None),
|
KeyBinding::new("cmd-t", OpenNewTab, None),
|
||||||
KeyBinding::new("ctrl-t", OpenNewTab, None),
|
KeyBinding::new("ctrl-t", OpenNewTab, None),
|
||||||
|
KeyBinding::new("cmd-shift-j", OpenDownloads, None),
|
||||||
|
KeyBinding::new("ctrl-shift-j", OpenDownloads, None),
|
||||||
KeyBinding::new("cmd-l", FocusAddressBar, None),
|
KeyBinding::new("cmd-l", FocusAddressBar, None),
|
||||||
KeyBinding::new("ctrl-l", FocusAddressBar, None),
|
KeyBinding::new("ctrl-l", FocusAddressBar, None),
|
||||||
KeyBinding::new("cmd-w", CloseCurrentTab, None),
|
KeyBinding::new("cmd-w", CloseCurrentTab, None),
|
||||||
@@ -63,6 +66,8 @@ fn main() {
|
|||||||
MenuItem::separator(),
|
MenuItem::separator(),
|
||||||
MenuItem::action("Restore Closed Tab", RestoreClosedTab),
|
MenuItem::action("Restore Closed Tab", RestoreClosedTab),
|
||||||
MenuItem::separator(),
|
MenuItem::separator(),
|
||||||
|
MenuItem::action("Open Downloads", OpenDownloads),
|
||||||
|
MenuItem::separator(),
|
||||||
MenuItem::action("Toggle Pin", TogglePinnedTab),
|
MenuItem::action("Toggle Pin", TogglePinnedTab),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use gpui::{App, AppContext, Context, Entity, FocusHandle, Focusable, Subscriptio
|
|||||||
use gpui_component::input::{InputEvent, InputState, SelectAll};
|
use gpui_component::input::{InputEvent, InputState, SelectAll};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
CloseCurrentTab, FocusAddressBar, OpenNewTab, RestoreClosedTab, SelectNextTab,
|
CloseCurrentTab, FocusAddressBar, OpenDownloads, OpenNewTab, RestoreClosedTab, SelectNextTab,
|
||||||
SelectPreviousTab, ToggleFavoriteTab, TogglePinnedTab,
|
SelectPreviousTab, ToggleFavoriteTab, TogglePinnedTab,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -90,6 +90,17 @@ impl ElyShell {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn open_downloads(&mut self, window: &mut Window, cx: &mut Context<Self>) {
|
||||||
|
if let ShellState::Ready(core) = &mut self.state
|
||||||
|
&& let Ok(url) = UrlText::parse("ely://downloads")
|
||||||
|
{
|
||||||
|
core.open_tab(url);
|
||||||
|
self.sync_address_input(window, cx);
|
||||||
|
self.focus_address_bar(window, cx);
|
||||||
|
cx.notify();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn focus_address_bar(&mut self, window: &mut Window, cx: &mut Context<Self>) {
|
fn focus_address_bar(&mut self, window: &mut Window, cx: &mut Context<Self>) {
|
||||||
self.command_input.update(cx, |input, cx| {
|
self.command_input.update(cx, |input, cx| {
|
||||||
input.focus(window, cx);
|
input.focus(window, cx);
|
||||||
@@ -203,6 +214,15 @@ impl ElyShell {
|
|||||||
self.open_new_tab(window, cx);
|
self.open_new_tab(window, cx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn on_open_downloads(
|
||||||
|
&mut self,
|
||||||
|
_: &OpenDownloads,
|
||||||
|
window: &mut Window,
|
||||||
|
cx: &mut Context<Self>,
|
||||||
|
) {
|
||||||
|
self.open_downloads(window, cx);
|
||||||
|
}
|
||||||
|
|
||||||
fn on_restore_closed_tab(
|
fn on_restore_closed_tab(
|
||||||
&mut self,
|
&mut self,
|
||||||
_: &RestoreClosedTab,
|
_: &RestoreClosedTab,
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ impl ElyShell {
|
|||||||
.track_focus(&self.focus_handle)
|
.track_focus(&self.focus_handle)
|
||||||
.on_action(cx.listener(Self::on_close_current_tab))
|
.on_action(cx.listener(Self::on_close_current_tab))
|
||||||
.on_action(cx.listener(Self::on_focus_address_bar))
|
.on_action(cx.listener(Self::on_focus_address_bar))
|
||||||
|
.on_action(cx.listener(Self::on_open_downloads))
|
||||||
.on_action(cx.listener(Self::on_open_new_tab))
|
.on_action(cx.listener(Self::on_open_new_tab))
|
||||||
.on_action(cx.listener(Self::on_restore_closed_tab))
|
.on_action(cx.listener(Self::on_restore_closed_tab))
|
||||||
.on_action(cx.listener(Self::on_select_next_tab))
|
.on_action(cx.listener(Self::on_select_next_tab))
|
||||||
|
|||||||
@@ -6,13 +6,21 @@ use crate::CoreError;
|
|||||||
const DEFAULT_SEARCH_URL: &str = "https://duckduckgo.com/";
|
const DEFAULT_SEARCH_URL: &str = "https://duckduckgo.com/";
|
||||||
|
|
||||||
pub(crate) fn tab_title(url: &UrlText) -> String {
|
pub(crate) fn tab_title(url: &UrlText) -> String {
|
||||||
if url.as_str() == "ely://new-tab" {
|
if let Some(title) = internal_page_title(url.as_str()) {
|
||||||
return "New Tab".to_string();
|
return title.to_string();
|
||||||
}
|
}
|
||||||
|
|
||||||
url.display_host()
|
url.display_host()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn internal_page_title(url: &str) -> Option<&'static str> {
|
||||||
|
match url {
|
||||||
|
"ely://new-tab" => Some("New Tab"),
|
||||||
|
"ely://downloads" => Some("Downloads"),
|
||||||
|
_ => None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub(crate) fn tab_matches_query(tab: &BrowserTab, normalized_query: &str) -> bool {
|
pub(crate) fn tab_matches_query(tab: &BrowserTab, normalized_query: &str) -> bool {
|
||||||
tab.title().to_lowercase().contains(normalized_query)
|
tab.title().to_lowercase().contains(normalized_query)
|
||||||
|| tab.url().as_str().to_lowercase().contains(normalized_query)
|
|| tab.url().as_str().to_lowercase().contains(normalized_query)
|
||||||
@@ -59,3 +67,7 @@ pub(crate) fn search_url(query: &str) -> Result<UrlText, CoreError> {
|
|||||||
url.query_pairs_mut().append_pair("q", query);
|
url.query_pairs_mut().append_pair("q", query);
|
||||||
UrlText::parse(url.to_string()).map_err(CoreError::from)
|
UrlText::parse(url.to_string()).map_err(CoreError::from)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) fn downloads_url() -> Result<UrlText, CoreError> {
|
||||||
|
UrlText::parse("ely://downloads").map_err(CoreError::from)
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,8 +3,8 @@ use ely_domain::{CommandIntent, CommandScope, ProfileId, ProfileKind, SpaceId};
|
|||||||
use crate::{
|
use crate::{
|
||||||
CoreError,
|
CoreError,
|
||||||
navigation::{
|
navigation::{
|
||||||
move_tab_space_name, new_profile_name, new_space_name, search_url, space_icon,
|
downloads_url, move_tab_space_name, new_profile_name, new_space_name, search_url,
|
||||||
switch_profile_name,
|
space_icon, switch_profile_name,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -85,6 +85,10 @@ impl BrowserCore {
|
|||||||
self.open_tab(self.new_tab_url.clone());
|
self.open_tab(self.new_tab_url.clone());
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
"downloads" | "open-downloads" | "open downloads" => {
|
||||||
|
self.open_tab(downloads_url()?);
|
||||||
|
Ok(true)
|
||||||
|
}
|
||||||
"close-tab" => {
|
"close-tab" => {
|
||||||
self.close_active_tab()?;
|
self.close_active_tab()?;
|
||||||
Ok(true)
|
Ok(true)
|
||||||
|
|||||||
@@ -49,6 +49,23 @@ fn new_tab_command_opens_new_tab() -> Result<(), Box<dyn Error>> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn open_downloads_command_opens_downloads_page() -> Result<(), Box<dyn Error>> {
|
||||||
|
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||||
|
|
||||||
|
core.set_command_query(">open-downloads");
|
||||||
|
let intent = core.submit_command()?;
|
||||||
|
let snapshot = core.snapshot()?;
|
||||||
|
let active_tab = core.active_tab()?;
|
||||||
|
|
||||||
|
assert_eq!(intent, Some(CommandIntent::Command("open-downloads".to_string())));
|
||||||
|
assert_eq!(snapshot.tabs.len(), 2);
|
||||||
|
assert_eq!(active_tab.title(), "Downloads");
|
||||||
|
assert_eq!(active_tab.url().as_str(), "ely://downloads");
|
||||||
|
assert_eq!(snapshot.command_query, "");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn new_space_command_creates_and_selects_named_space() -> Result<(), Box<dyn Error>> {
|
fn new_space_command_creates_and_selects_named_space() -> Result<(), Box<dyn Error>> {
|
||||||
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
let mut core = BrowserCore::new(InitialBrowserConfig::ely_defaults()?)?;
|
||||||
|
|||||||
Reference in New Issue
Block a user