Dev (#12)

* quick_settings

* refactor

* stable

* f

Author: wiiznokes

Diff for: .vscode/launch.json

@@ -1,45 +1,45 @@
 {
-    // Use IntelliSense to learn about possible attributes.
-    // Hover to view descriptions of existing attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "Debug executable 'cosmic-clipboard-manager'",
-            "cargo": {
-                "args": [
-                    "build",
-                    "--bin=cosmic-clipboard-manager",
-                    "--package=cosmic-clipboard-manager"
-                ],
-                "filter": {
-                    "name": "cosmic-clipboard-manager",
-                    "kind": "bin"
-                }
-            },
-            "args": [],
-            "cwd": "${workspaceFolder}"
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "Debug unit tests in executable 'cosmic-clipboard-manager'",
-            "cargo": {
-                "args": [
-                    "test",
-                    "--no-run",
-                    "--bin=cosmic-clipboard-manager",
-                    "--package=cosmic-clipboard-manager"
-                ],
-                "filter": {
-                    "name": "cosmic-clipboard-manager",
-                    "kind": "bin"
-                }
-            },
-            "args": [],
-            "cwd": "${workspaceFolder}"
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug executable 'cosmic-clipboard-manager'",
+      "cargo": {
+        "args": [
+          "build",
+          "--bin=cosmic-clipboard-manager",
+          "--package=cosmic-clipboard-manager"
+        ],
+        "filter": {
+          "name": "cosmic-clipboard-manager",
+          "kind": "bin"
         }
-    ]
-}
+      },
+      "args": [],
+      "cwd": "${workspaceFolder}"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug unit tests in executable 'cosmic-clipboard-manager'",
+      "cargo": {
+        "args": [
+          "test",
+          "--no-run",
+          "--bin=cosmic-clipboard-manager",
+          "--package=cosmic-clipboard-manager"
+        ],
+        "filter": {
+          "name": "cosmic-clipboard-manager",
+          "kind": "bin"
+        }
+      },
+      "args": [],
+      "cwd": "${workspaceFolder}"
+    }
+  ]
+}

Diff for: Cargo.toml

@@ -40,8 +40,9 @@ features = [
     "tokio",
     "wayland",
     "desktop",
-    #"wgpu",
+    #"multi-window",
     #"winit",
+    #"wgpu",
 ]
 
 [dependencies.wl-clipboard-rs]

Diff for: DEV.md

@@ -1,6 +1,7 @@
 ## DEPS
 
 #### Fedora
+
 ```sh
 sudo dnf install libxkbcommon-devel -y
 ```
@@ -10,29 +11,29 @@ sudo dnf install libxkbcommon-devel -y
 ```
 journalctl --user _EXE=/usr/bin/cosmic-session -r -S -10m | grep cosmic_clipboard_manager > ~/log.txt && code ~/log.txt
 ```
+
 ## INfO
 
 clipboard crates:
+
 - https://crates.io/crates/wl-clipboard-rs
 - https://crates.io/crates/arboard
 
-
 wayland protocol / official impl:
+
 - https://wayland.app/protocols/wlr-data-control-unstable-v1
 - https://github.com/bugaevc/wl-clipboard/tree/master/src
 
-
 other app:
-- https://github.com/mohamadzoh/clipop
-
 
+- https://github.com/mohamadzoh/clipop
 
 discussions:
+
 - https://github.com/pop-os/cosmic-epoch/issues/175
 - https://www.reddit.com/r/pop_os/comments/194bugz/comment/khfxyoo/?utm_source=share&utm_medium=web3x&utm_name=web3xcss&utm_term=1&utm_content=share_button
 
-
-
 links:
+
 - https://github.com/pop-os/cosmic-launcher/blob/master/src/app.rs
-- https://github.com/pop-os/cosmic-applets
+- https://github.com/pop-os/cosmic-applets

Diff for: README.md

@@ -4,18 +4,18 @@
 
 The goal is to make a simple yet fast clipboard history, with a focus on UX, rapidity and security.
 
-
 Currently support storing the history on disk, search, delete
 
+There is a quick settings popup when you right click the icon.
 
 Todo:
+
 - image support
 - auto remove old entries
 - ...
 
 Maybe take inspiration on this gnome extension: https://github.com/oae/gnome-shell-pano
 
-
 ## Install
 
 ```
@@ -25,21 +25,23 @@ just install
 ```
 
 You curently need to activate a setting of the compositor:
+
 ```
 sudo nano /etc/cosmic-comp/config.ron
 ```
+
 And change `data_control_enabled: false` to `true` at the end of the file. Note that you may need to reset the setting at each update you make (at least, i noticied it on Fedora).
 
 Obiously, a better integration is planned, maybe with a portal that ask the user if they want to activate this protocol (which is insecure since its let an app access the clipboard without receiving an event for it (like ctrl-c) or being focused).
 
 Finally, you will need to set up the applet in cosmic-settings.
 
-
 ## Logs
 
 ```
 journalctl -p 3 -xb --user _EXE=/usr/bin/cosmic-panel | grep com.wiiznokes.CosmicClipboardManager
 ```
+
 -p 3 means priority error
 -x add information
 b means since last boot

Diff for: justfile

@@ -7,6 +7,10 @@ install:
 	sudo install -Dm0644 resources/{{APP_ID}}.desktop /usr/share/app_IDlications/com.wiiznokes.CosmicClipboardManager.desktop
 	sudo install -Dm0644 resources/icons/assignment24.svg /usr/share/{{APP_ID}}/icons/assignment24.svg
 
+
+pull: fmt prettier fix
+	
+
 ###################  Test
 
 test:

Diff for: resources/icons/settings24.svg

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "stable"

Diff for: rust-toolchain.toml

@@ -10,14 +10,15 @@ use cosmic::iced_runtime::command::Action;
 use cosmic::iced_runtime::core::window;
 use cosmic::iced_style::application;
 use cosmic::iced_widget::Column;
-use cosmic::widget::{button, icon, text, text_input};
+use cosmic::widget::{button, icon, text, text_input, MouseArea};
 
 use cosmic::{Element, Theme};
 
 use crate::config::{Config, CONFIG_VERSION, PRIVATE_MODE};
 use crate::db::{self, Data, Db};
 use crate::message::AppMessage;
 use crate::utils::command_message;
+use crate::view::{popup_view, quick_settings_view};
 use crate::{clipboard, config, navigation};
 
 use cosmic::cosmic_config;
@@ -31,6 +32,7 @@ pub struct Window {
     config_handler: Option<cosmic_config::Config>,
     popup: Option<Id>,
     state: AppState,
+    quick_settings_visible: bool,
 }
 
 pub struct AppState {
@@ -98,11 +100,12 @@ impl cosmic::Application for Window {
                 focused: 0,
             },
             config,
+            quick_settings_visible: false,
         };
 
         #[cfg(debug_assertions)]
         let command = Command::single(Action::Future(Box::pin(async {
-            cosmic::app::Message::App(AppMessage::TogglePopup)
+            cosmic::app::Message::App(AppMessage::QuickSettings)
         })));
 
         #[cfg(not(debug_assertions))]
@@ -148,9 +151,30 @@ impl cosmic::Application for Window {
                     self.config = config;
                 }
             }
+            AppMessage::QuickSettings => {
+                return if let Some(p) = self.popup.take() {
+                    self.quick_settings_visible = false;
+                    destroy_popup(p)
+                } else {
+                    self.quick_settings_visible = true;
+                    let new_id = Id::unique();
+                    self.popup.replace(new_id);
+                    let mut popup_settings =
+                        self.core
+                            .applet
+                            .get_popup_settings(Id::MAIN, new_id, None, None, None);
+                    popup_settings.positioner.size_limits = Limits::NONE
+                        .max_width(250.0)
+                        .min_width(200.0)
+                        .min_height(200.0)
+                        .max_height(550.0);
+                    get_popup(popup_settings)
+                };
+            }
+
             AppMessage::TogglePopup => {
                 //info!("TogglePopup");
-
+                self.quick_settings_visible = false;
                 return if let Some(p) = self.popup.take() {
                     destroy_popup(p)
                 } else {
@@ -232,18 +256,25 @@ impl cosmic::Application for Window {
     }
 
     fn view(&self) -> Element<Self::Message> {
-        self.core
+        let icon = self
+            .core
             .applet
             .icon_button("/usr/share/com.wiiznokes.CosmicClipboardManager/icons/assignment24.svg")
-            .on_press(AppMessage::TogglePopup)
+            .on_press(AppMessage::TogglePopup);
+
+        MouseArea::new(icon)
+            .on_right_release(AppMessage::QuickSettings)
             .into()
     }
 
     fn view_window(&self, _id: Id) -> Element<Self::Message> {
-        self.core
-            .applet
-            .popup_container(self.state.view(&self.config))
-            .into()
+        let view = if self.quick_settings_visible {
+            quick_settings_view(&self.state, &self.config)
+        } else {
+            popup_view(&self.state, &self.config)
+        };
+
+        self.core.applet.popup_container(view).into()
     }
     fn subscription(&self) -> Subscription<Self::Message> {
         let mut subscriptions = vec![config::sub(), navigation::sub().map(AppMessage::Navigation)];

Diff for: src/app.rs

@@ -1,4 +1,3 @@
-#![feature(split_at_checked)]
 
 #![allow(dead_code)]
 #![allow(unused_macros)]

Diff for: src/main.rs

@@ -12,6 +12,7 @@ use crate::{
 pub enum AppMessage {
     ChangeConfig(Config),
     TogglePopup,
+    QuickSettings,
     ClosePopup(Id),
     Search(String),
     ClipboardEvent(ClipboardMessage),

Diff for: src/message.rs

@@ -36,7 +36,7 @@ fn split_at(str: &str, n: usize) -> &str {
     if str.len() > n {
         let mut i = n;
         loop {
-            if let Some((left, _)) = str.split_at_checked(i) {
+            if let Some((left, _)) = split_at_checked(str, i) {
                 return left;
             }
             i -= 1;
@@ -46,6 +46,17 @@ fn split_at(str: &str, n: usize) -> &str {
     }
 }
 
+// https://github.com/rust-lang/rust/issues/119128
+pub fn split_at_checked(s: &str, mid: usize) -> Option<(&str, &str)> {
+    // is_char_boundary checks that the index is in [0, .len()]
+    if s.is_char_boundary(mid) {
+        // SAFETY: just checked that `mid` is on a char boundary.
+        Some(unsafe { (s.get_unchecked(0..mid), s.get_unchecked(mid..s.len())) })
+    } else {
+        None
+    }
+}
+
 pub fn horizontal_padding(value: f32) -> Padding {
     Padding {
         top: 0f32,