Skip to content

Commit

Permalink
chore: migrate to pop launcher fork
Browse files Browse the repository at this point in the history
  • Loading branch information
oknozor committed Jan 22, 2024
1 parent 58bc255 commit 8233b8a
Show file tree
Hide file tree
Showing 12 changed files with 108 additions and 238 deletions.
190 changes: 99 additions & 91 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ iced_style = "0.9.0"
tokio = { version = "1.29.1", features = ["process", "macros", "io-util"] }
sled = "0.34.7"

pop-launcher-toolkit = { path = "../launcher/toolkit" }
onagre-launcher-toolkit = "0.1.1"
structopt = { version = "^0", default-features = false, optional = true }
freedesktop-icons = "0.2.3"

Expand Down
2 changes: 1 addition & 1 deletion src/app/entries/pop_entry.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use pop_launcher_toolkit::launcher::SearchResult;
use onagre_launcher_toolkit::launcher::SearchResult;
use std::borrow::Cow;

use crate::app::entries::AsEntry;
Expand Down
2 changes: 1 addition & 1 deletion src/app/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use iced_core::widget::operation::scrollable::RelativeOffset;
use iced_style::Theme;
use log::{debug, trace};
use once_cell::sync::Lazy;
use pop_launcher_toolkit::launcher::{Request, Response};
use onagre_launcher_toolkit::launcher::{Request, Response};

use crate::app::entries::AsEntry;
use crate::app::entries::pop_entry::PopSearchResult;
Expand Down
4 changes: 2 additions & 2 deletions src/app/mode.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::app::plugin_matchers::QueryData;
use once_cell::sync::Lazy;
use pop_launcher_toolkit::plugins::web::Config as WebConfig;
use onagre_launcher_toolkit::plugins::web::Config as WebConfig;

pub(crate) static WEB_CONFIG: Lazy<WebConfig> = Lazy::new(pop_launcher_toolkit::plugins::web::load);
pub(crate) static WEB_CONFIG: Lazy<WebConfig> = Lazy::new(onagre_launcher_toolkit::plugins::web::load);

#[derive(Debug, PartialEq, Clone, Default)]
pub enum ActiveMode {
Expand Down
2 changes: 1 addition & 1 deletion src/app/state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::app::cache::Cache;
use crate::app::mode::ActiveMode;
use crate::app::plugin_matchers::{match_web_plugins, Plugin};
use log::debug;
use pop_launcher_toolkit::launcher::SearchResult;
use onagre_launcher_toolkit::launcher::SearchResult;

use crate::app::{Message, INPUT_ID};
use crate::icons::IconPath;
Expand Down
2 changes: 1 addition & 1 deletion src/app/subscriptions/plugin_configs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ impl Recipe for PluginMatcherSubscription {

fn stream(self: Box<Self>, _: BoxStream<(iced::Event, Status)>) -> BoxStream<Self::Output> {
Box::pin(
pop_launcher_toolkit::service::load::from_paths().map(|(path, config, regex)| {
onagre_launcher_toolkit::service::load::from_paths().map(|(path, config, regex)| {
let icon: Option<IconPath> = THEME.icon_theme.as_ref().and_then(|theme| {
config
.icon
Expand Down
2 changes: 1 addition & 1 deletion src/app/subscriptions/pop_launcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use iced::futures::channel::mpsc;
use iced::futures::channel::mpsc::{channel, Sender};
use iced::futures::{join, SinkExt, StreamExt};
use log::debug;
use pop_launcher_toolkit::launcher::{json_input_stream, Request, Response};
use onagre_launcher_toolkit::launcher::{json_input_stream, Request, Response};
use std::hash::{Hash};
use std::process::Stdio;
use iced::futures::stream::BoxStream;
Expand Down
Binary file removed src/font/JetBrainsMonoNL-Regular.ttf
Binary file not shown.
Loading

0 comments on commit 8233b8a

Please sign in to comment.