Merge branch 'master' into recent-actions

Author: unsecretised

Cargo.lock

@@ -30,6 +30,7 @@ objc2-foundation = { version = "0.3.2", features = ["NSString"] }
 once_cell = "1.21.3"
 rand = "0.9.2"
 rayon = "1.11.0"
+rfd = "0.17.2"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 tokio = { version = "1.48.0", features = ["full"] }

Cargo.toml

@@ -27,13 +27,20 @@
   </a>
 </p>
 
+> [Those who sponsor me also get a personal easter egg inside RustCast](https://github.com/sponsors/unsecretised)
+
 **Config docs:** https://github.com/unsecretised/rustcast/wiki
 
 **Community:** https://discord.gg/bDfNYPbnC5
 
 **Plugins**:
 [RustCast Library for shell scripts](https://github.com/unsecretised/rustcast-library)
 
+> For support use github discussions / issues / the discord
+>
+> You can also contact unsecretised / secretised at
+> [admin@rustcast.app](mailto:admin+gh@rustcast.app)
+
 ![RustCast Demo](./docs/rustcast-latest-demo.png)
 
 ## Installation:
@@ -119,11 +126,12 @@ configure [The list](docs/config.toml).
   and has been using RustCast since almost the first version!
 - [Hriztam](https://github.com/hriztam) - Added support for unit conversions to
   rustcast
+- [Lars-Schumann](https://github.com/Lars-Schumann) - Sponsored me
+- [Tanishq Dubey](https://github.com/tanishq-dubey) - Contributor, improved the
+  file search to use `mdfind`
+- [JON](https://github.com/jiasunzhu613) - Contributor,
 
-All the people who starred my repo!!
-
-Those who sponsor me also get a free easter egg inside RustCast, so if you want
-a free easter egg, a dollar is all you need!
+And ofc, all the people who starred my repo!!
 
 And the updated list of contributors to the macos version:
 
@@ -135,6 +143,8 @@ And the updated list of contributors to the macos version:
 
 - Nazeofel (Random Variable on discord) -> led to the _randomvar_ easter egg
 - Lemon -> led to the _lemon_ easter egg that shows "lemon" on rustcast
+- Lars-Schumann -> search _f_ and get ferris.rs as a result
+- Me -> 67
 
 ## If you like rustcast, consider starring it on github :)
 

README.md

@@ -30,7 +30,7 @@
             href="https://github.com/sponsors/unsecretised"
             class="nav-sponsor"
             target="_blank"
-          >♥ Sponsor</a>
+          >♥ Get your easter egg</a>
         </li>
         <li>
           <a
@@ -75,8 +75,8 @@ <h1>The <em>fastest</em> launcher<br />you'll ever use</h1>
         </a>
       </div>
       <div class="stats-row">
-        <div class="stat"><strong>400+</strong> stars</div>
-        <div class="stat"><strong>1.1k+</strong> downloads</div>
+        <div class="stat"><strong>500+</strong> stars</div>
+        <div class="stat"><strong>1.2k+</strong> downloads</div>
         <div class="stat"><strong>100%</strong> free forever</div>
         <div class="stat"><strong>MIT</strong> license</div>
       </div>
@@ -464,6 +464,20 @@ <h2>Built by the community</h2>
           >
             <span class="gh-icon">◉</span>Lars - Sponsor
           </a>
+          <a
+            href="https://github.com/tanishq-dubey"
+            class="contrib-chip"
+            target="_blank"
+          >
+            <span class="gh-icon">◉</span> Tanishq Dubey - Contributor
+          </a>
+          <a
+            href="https://github.com/jiasunzhu613"
+            class="contrib-chip"
+            target="_blank"
+          >
+            <span class="gh-icon">◉</span> JON - Contributor
+          </a>
         </div>
         <div class="sponsor-cta-row">
           <a

docs/index.html

@@ -69,10 +69,17 @@ pub enum Move {
     Forwards(String),
 }
 
+#[derive(Debug, Clone)]
+pub enum Editable<T> {
+    Create(T),
+    Delete(T),
+    Update { old: T, new: T },
+}
+
 /// The message type that iced uses for actions that can do something
 #[derive(Debug, Clone)]
 pub enum Message {
-    WriteConfig,
+    WriteConfig(bool),
     UpdateAvailable,
     ResizeWindow(Id, f32),
     OpenWindow,
@@ -85,6 +92,7 @@ pub enum Message {
     RunFunction(Function),
     OpenFocused,
     SetConfig(SetConfigFields),
+    OpenFileDialogue(String),
     ReturnFocus,
     EscKeyPressed(Id),
     ClearSearchResults,
@@ -93,9 +101,11 @@ pub enum Message {
     HideTrayIcon,
     SwitchMode(String),
     ReloadConfig,
+    UpdateApps,
     SetSender(ExtSender),
     SwitchToPage(Page),
-    ClipboardHistory(ClipBoardContentType),
+    EditClipboardHistory(Editable<ClipBoardContentType>),
+    ClearClipboardHistory,
     ChangeFocus(ArrowKey, u32),
     FileSearchResult(Vec<App>),
     FileSearchClear,
@@ -104,6 +114,7 @@ pub enum Message {
 }
 
 #[derive(Debug, Clone)]
+#[allow(unused)]
 pub enum SetConfigFields {
     ToDefault,
     ToggleHotkey(String),
@@ -112,16 +123,17 @@ pub enum SetConfigFields {
     SearchUrl(String),
     HapticFeedback(bool),
     ShowMenubarIcon(bool),
-    //    Modes(HashMap<String, String>),
-    //    Aliases(HashMap<String, String>),
-    //    SearchDirs(Vec<String>),
+    Modes(Editable<(String, String)>),
+    Aliases(Editable<(String, String)>),
+    SearchDirs(Editable<Vec<String>>),
     DebounceDelay(u64),
     SetThemeFields(SetConfigThemeFields),
     SetBufferFields(SetConfigBufferFields),
 }
 
 #[derive(Debug, Clone)]
 pub enum SetConfigThemeFields {
+    ShowScrollBar(bool),
     TextColor(f32, f32, f32),
     BackgroundColor(f32, f32, f32),
     ShowIcons(bool),

src/app.rs

@@ -176,7 +176,7 @@ impl App {
                 Text::new(self.display_name)
                     .font(theme.font())
                     .size(16)
-                    .wrapping(Wrapping::WordOrGlyph)
+                    .wrapping(Wrapping::None)
                     .color(theme.text_color(1.0)),
             )
             .push(

src/app/apps.rs

@@ -39,14 +39,14 @@ pub fn menu_icon(config: Config, sender: ExtSender) -> TrayIcon {
 }
 
 pub fn menu_builder(config: Config, sender: ExtSender, update_item: bool) -> Menu {
-    let hotkey = config.toggle_hotkey.parse::<HotKey>().unwrap();
+    let hotkey = config.toggle_hotkey.parse::<HotKey>().ok();
 
     let mut modes = config.modes;
     if !modes.contains_key("default") {
         modes.insert("Default".to_string(), "default".to_string());
     }
 
-    init_event_handler(sender, hotkey.id());
+    init_event_handler(sender, hotkey.map(|x| x.id));
 
     Menu::with_items(&[
         &MenuItem::with_id(
@@ -86,7 +86,7 @@ fn get_image() -> DynamicImage {
         .unwrap()
 }
 
-fn init_event_handler(sender: ExtSender, hotkey_id: u32) {
+fn init_event_handler(sender: ExtSender, hotkey_id: Option<u32>) {
     let runtime = Runtime::new().unwrap();
 
     MenuEvent::set_event_handler(Some(move |x: MenuEvent| {
@@ -107,12 +107,11 @@ fn init_event_handler(sender: ExtSender, hotkey_id: u32) {
                 open_url("https://github.com/unsecretised/rustcast/issues/new");
             }
             "show_rustcast" => {
-                runtime.spawn(async move {
-                    sender
-                        .clone()
-                        .try_send(Message::KeyPressed(hotkey_id))
-                        .unwrap();
-                });
+                if let Some(hk) = hotkey_id {
+                    runtime.spawn(async move {
+                        sender.clone().try_send(Message::KeyPressed(hk)).unwrap();
+                    });
+                }
             }
             "update" => {
                 open_url("https://github.com/unsecretised/rustcast/releases/latest");
@@ -179,12 +178,12 @@ fn mode_item(modes: HashMap<String, String>) -> Submenu {
     Submenu::with_items("Modes", true, &items).unwrap()
 }
 
-fn open_item(hotkey: HotKey) -> MenuItem {
+fn open_item(hotkey: Option<HotKey>) -> MenuItem {
     MenuItem::with_id(
         "show_rustcast",
         "Toggle View",
         true,
-        Some(Accelerator::new(Some(hotkey.mods), hotkey.key)),
+        hotkey.map(|hk| Accelerator::new(Some(hk.mods), hk.key)),
     )
 }