Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 83b422599c | |||
| 7ebaa0db4d | |||
| acbf499bb7 | |||
| 8bc6d5d1c5 | |||
| 4b7bdc487f |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +1,2 @@
|
||||
target/
|
||||
.gitea_token
|
||||
|
||||
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -148,7 +148,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "cliphoard"
|
||||
version = "1.1.0"
|
||||
version = "1.3.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"dirs",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "cliphoard"
|
||||
version = "1.1.0"
|
||||
version = "1.3.0"
|
||||
edition = "2021"
|
||||
description = "A tiny, keyboard-first clipboard history utility"
|
||||
license = "MIT"
|
||||
|
||||
@@ -8,7 +8,7 @@ with SQLCipher and unlocked with a passphrase that Cliphoard does not store.
|
||||
Install the package on Debian, Ubuntu, or Mint:
|
||||
|
||||
```bash
|
||||
sudo apt install ./cliphoard_1.1.0_amd64.deb
|
||||
sudo apt install ./cliphoard_1.3.0_amd64.deb
|
||||
```
|
||||
|
||||
The package installs the `cliphoard` command, desktop launcher, tray icon,
|
||||
@@ -29,7 +29,7 @@ sudo apt install cargo rustc dpkg-dev libgtk-4-dev libdbus-1-dev libx11-dev libx
|
||||
cargo test --locked --all-features
|
||||
cargo build --release --locked --features gui
|
||||
packaging/build-deb.sh
|
||||
sudo apt install ./target/cliphoard_1.1.0_amd64.deb
|
||||
sudo apt install ./target/cliphoard_1.3.0_amd64.deb
|
||||
```
|
||||
|
||||
An isolated Docker build produces the same package:
|
||||
|
||||
33
RELEASE_NOTES.md
Normal file
33
RELEASE_NOTES.md
Normal file
@@ -0,0 +1,33 @@
|
||||
# Cliphoard 1.3.0
|
||||
|
||||
## Highlights
|
||||
|
||||
- Added light, dark, and system appearance settings.
|
||||
- Added optional timestamps for clipboard entries.
|
||||
- Improved the popup controls with symbolic icons, tooltips, grouped footer
|
||||
actions, and clearer selected and pinned-entry styling.
|
||||
- Added confirmation dialogs for destructive history and entry actions.
|
||||
- Improved status feedback and action sensitivity when no entry is selected.
|
||||
- Settings changes are persisted in the user configuration file.
|
||||
|
||||
## Compatibility and migration
|
||||
|
||||
This release continues to use encrypted SQLCipher storage and the existing
|
||||
passphrase. No database migration is required; new configuration fields use
|
||||
backward-compatible defaults. Plaintext databases remain unsupported and are
|
||||
not opened or migrated. If Cliphoard reports that the database is plaintext,
|
||||
stop Cliphoard and remove the old database before starting this release:
|
||||
|
||||
```bash
|
||||
pkill -x cliphoard || true
|
||||
rm -f ~/.local/share/cliphoard/cliphoard.db \
|
||||
~/.local/share/cliphoard/cliphoard.db.plaintext-backup*
|
||||
```
|
||||
|
||||
This permanently removes that local history. If it is needed, preserve a copy
|
||||
and use the previous release to export or otherwise preserve it first.
|
||||
|
||||
## Build requirements
|
||||
|
||||
Linux/X11, GTK4, and the runtime libraries listed by the Debian package are
|
||||
required. See `README.md` for installation and plaintext-database handling.
|
||||
119
RELEASING.md
119
RELEASING.md
@@ -1,7 +1,7 @@
|
||||
# Cliphoard release procedure
|
||||
|
||||
Run releases from the repository root. The current Git remote stores source
|
||||
and tags, but no binary-upload destination is configured.
|
||||
Run releases from the repository root. The process produces a source tag,
|
||||
release binary, Debian package, checksums, and a Gitea release.
|
||||
|
||||
## Prepare
|
||||
|
||||
@@ -11,10 +11,19 @@ git pull --ff-only
|
||||
git status --short
|
||||
```
|
||||
|
||||
Choose the next semantic version, for example `1.1.0`, and tag it `v1.1.0`.
|
||||
Choose the next semantic version and matching tag, for example `1.3.0` and
|
||||
`v1.3.0`. Set the version once for the commands below:
|
||||
|
||||
```bash
|
||||
VERSION="1.3.0"
|
||||
TAG="v${VERSION}"
|
||||
```
|
||||
|
||||
Update the version in `Cargo.toml`, the root `cliphoard` package in
|
||||
`Cargo.lock`, `packaging/debian/control`, `packaging/build-deb.sh`, and the
|
||||
versioned `.deb` names in `README.md`.
|
||||
versioned `.deb` names in `README.md`. Review changes since the previous tag
|
||||
and write notes covering features, fixes, breaking changes, migration needs,
|
||||
passphrase behavior, and platform requirements.
|
||||
|
||||
## Verify and build
|
||||
|
||||
@@ -23,20 +32,22 @@ cargo fmt --all -- --check
|
||||
cargo test --locked --all-features
|
||||
cargo clippy --locked --all-features -- -D warnings
|
||||
cargo build --release --locked --features gui
|
||||
CLIPHOARD_VERSION=1.1.0 packaging/build-deb.sh
|
||||
dpkg-deb --info target/cliphoard_1.1.0_amd64.deb
|
||||
dpkg-deb --contents target/cliphoard_1.1.0_amd64.deb
|
||||
sha256sum target/cliphoard_1.1.0_amd64.deb target/release/cliphoard
|
||||
CLIPHOARD_VERSION="$VERSION" packaging/build-deb.sh
|
||||
dpkg-deb --info "target/cliphoard_${VERSION}_amd64.deb"
|
||||
dpkg-deb --contents "target/cliphoard_${VERSION}_amd64.deb"
|
||||
sha256sum "target/cliphoard_${VERSION}_amd64.deb" target/release/cliphoard > "target/cliphoard_${VERSION}_SHA256SUMS"
|
||||
```
|
||||
|
||||
The Docker workflow from the README provides an isolated test, release-build,
|
||||
and package-build path:
|
||||
The isolated package path is:
|
||||
|
||||
```bash
|
||||
docker build -t cliphoard-builder .
|
||||
docker run --rm -v "$PWD/target:/out" cliphoard-builder
|
||||
```
|
||||
|
||||
Do not commit `target/`; retain the exact package, binary, and checksum files
|
||||
for upload.
|
||||
|
||||
## Commit and tag
|
||||
|
||||
Only commit after the gates pass:
|
||||
@@ -45,35 +56,89 @@ Only commit after the gates pass:
|
||||
git diff --check
|
||||
git status --short
|
||||
git add Cargo.toml Cargo.lock README.md packaging/debian/control packaging/build-deb.sh src .agents RELEASING.md
|
||||
git commit -m "Release Cliphoard 1.1.0"
|
||||
git tag -a v1.1.0 -m "Release Cliphoard 1.1.0"
|
||||
git commit -m "Release Cliphoard ${VERSION}"
|
||||
git tag -a "$TAG" -m "Release Cliphoard ${VERSION}"
|
||||
```
|
||||
|
||||
Replace `1.1.0` and `v1.1.0` with the actual version.
|
||||
Replace `1.2.0` and `v1.2.0` with the actual version.
|
||||
|
||||
## Sync
|
||||
## Push Git
|
||||
|
||||
Confirm the remote has not moved since the preparation pull. Never force-push:
|
||||
|
||||
```bash
|
||||
git show --stat --oneline HEAD
|
||||
git show --no-patch --decorate HEAD
|
||||
git push origin main
|
||||
git push origin v1.1.0
|
||||
git push origin "$TAG"
|
||||
```
|
||||
|
||||
If another commit landed remotely after the initial pull, stop and resolve it
|
||||
before pushing. Never force-push release history.
|
||||
If the remote changed, stop and reconcile it before pushing.
|
||||
|
||||
## Publish the Gitea release and binary
|
||||
## Publish on Gitea
|
||||
|
||||
Pushing Git does not upload `target/*.deb`: `target/` is ignored and the
|
||||
binary is not committed. Create a Gitea release for the pushed tag, include a
|
||||
summary of commits and changes, explicitly call out breaking changes, and
|
||||
attach the `.deb`, release binary, and checksum file. The release must include
|
||||
the plaintext-database deletion note and commands from `README.md`.
|
||||
Pushing Git does not upload ignored `target/` files. Create a release for the
|
||||
pushed tag and attach:
|
||||
|
||||
- `target/cliphoard_${VERSION}_amd64.deb`
|
||||
- `target/release/cliphoard`
|
||||
- `target/cliphoard_${VERSION}_SHA256SUMS`
|
||||
|
||||
Using the Gitea web UI: open **Releases**, choose **New Release**, select
|
||||
the release tag, enter `Cliphoard ${VERSION}`, paste the release notes, upload all three
|
||||
files, and publish. Include breaking changes and the plaintext-database
|
||||
deletion warning and commands from `README.md`.
|
||||
|
||||
For API automation, use the repository release-write token stored locally in
|
||||
`~/.gitea_token`. The file must contain the raw token on one line, remain
|
||||
user-readable only, and never be printed, pasted into chat, put in shell
|
||||
history, or committed. It is ignored by this repository. Load it into the
|
||||
current process without exposing its value:
|
||||
|
||||
```bash
|
||||
test -r "$HOME/.gitea_token"
|
||||
test "$(stat -c '%a' "$HOME/.gitea_token")" = 600
|
||||
GITEA_TOKEN="$(tr -d '\r\n' < "$HOME/.gitea_token")"
|
||||
GITEA_URL="https://git.kindle-techprojects.com"
|
||||
GITEA_OWNER="haffel-public"
|
||||
GITEA_REPO="app__cliphoard"
|
||||
TAG="v${VERSION}"
|
||||
```
|
||||
|
||||
Verify the token has repository access before creating a release. The command
|
||||
discards the response body so it does not expose repository metadata:
|
||||
|
||||
```bash
|
||||
curl --fail-with-body -sS -o /dev/null \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
"${GITEA_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}"
|
||||
```
|
||||
|
||||
Create the release, then upload each artifact:
|
||||
|
||||
```bash
|
||||
release_json=$(curl --fail-with-body -sS \
|
||||
-H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-H 'Content-Type: application/json' \
|
||||
-d "$(jq -n --arg tag "$TAG" --arg name "Cliphoard $VERSION" --arg body "$(cat RELEASE_NOTES.md)" \
|
||||
'{tag_name:$tag,target_commitish:"main",name:$name,body:$body,draft:false,prerelease:false}')" \
|
||||
"${GITEA_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases"
|
||||
release_id=$(jq -r '.id' <<<"$release_json")
|
||||
for artifact in "target/cliphoard_${VERSION}_amd64.deb" "target/release/cliphoard" "target/cliphoard_${VERSION}_SHA256SUMS"; do
|
||||
curl --fail-with-body -sS -H "Authorization: token ${GITEA_TOKEN}" \
|
||||
-F "attachment=@${artifact}" \
|
||||
"${GITEA_URL}/api/v1/repos/${GITEA_OWNER}/${GITEA_REPO}/releases/${release_id}/assets?name=$(basename "$artifact")"
|
||||
done
|
||||
```
|
||||
|
||||
If an earlier attempt already created the release, query the releases endpoint
|
||||
and upload missing assets instead of creating a duplicate. If no authenticated
|
||||
Gitea web session or usable API token is available, stop after the Git push and
|
||||
resume at publication.
|
||||
|
||||
## Final smoke check
|
||||
|
||||
On a clean machine or disposable environment, install the exact `.deb`, start
|
||||
Cliphoard, create/unlock the encrypted database, and confirm the tray, popup,
|
||||
autostart, and passphrase flows. Keep the release commit, tag, artifact name,
|
||||
checksum, and test results together.
|
||||
On a clean machine, install the exact `.deb`, start Cliphoard, create/unlock
|
||||
the encrypted database, and check tray, popup, autostart, settings, and
|
||||
passphrase flows. Verify artifacts against `cliphoard_${VERSION}_SHA256SUMS` and
|
||||
record the release URL, tag, checksums, and test results.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
set -eu
|
||||
|
||||
version="${CLIPHOARD_VERSION:-1.1.0}"
|
||||
version="${CLIPHOARD_VERSION:-1.3.0}"
|
||||
package_root="${PWD}/target/cliphoard-deb"
|
||||
rm -rf "$package_root"
|
||||
mkdir -p "$package_root/DEBIAN" \
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Package: cliphoard
|
||||
Version: 1.1.0
|
||||
Version: 1.3.0
|
||||
Section: utils
|
||||
Priority: optional
|
||||
Architecture: amd64
|
||||
|
||||
@@ -2,7 +2,7 @@ use anyhow::{Context, Result};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{fs, os::unix::fs::PermissionsExt, path::PathBuf};
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]
|
||||
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
|
||||
#[serde(default)]
|
||||
pub struct Config {
|
||||
pub history_limit: usize,
|
||||
@@ -11,10 +11,30 @@ pub struct Config {
|
||||
pub history_retention_days: u64,
|
||||
pub global_shortcut: String,
|
||||
pub autostart: bool,
|
||||
pub always_on_top: bool,
|
||||
pub show_window_after_unlock: bool,
|
||||
pub clear_search_on_reopen: bool,
|
||||
pub show_timestamps: bool,
|
||||
pub inactive_opacity: f64,
|
||||
pub theme: Theme,
|
||||
pub ignored_patterns: Vec<String>,
|
||||
pub log_level: String,
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub enum Theme {
|
||||
System,
|
||||
Light,
|
||||
Dark,
|
||||
}
|
||||
|
||||
impl Default for Theme {
|
||||
fn default() -> Self {
|
||||
Self::System
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Config {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
@@ -24,7 +44,13 @@ impl Default for Config {
|
||||
history_retention_days: 30,
|
||||
global_shortcut: "Ctrl+Alt+V".into(),
|
||||
autostart: true,
|
||||
always_on_top: true,
|
||||
show_window_after_unlock: true,
|
||||
clear_search_on_reopen: false,
|
||||
show_timestamps: false,
|
||||
inactive_opacity: 0.60,
|
||||
theme: Theme::System,
|
||||
ignored_patterns: Vec::new(),
|
||||
log_level: "info".into(),
|
||||
}
|
||||
}
|
||||
@@ -97,6 +123,9 @@ impl Config {
|
||||
if self.history_retention_days == 0 {
|
||||
anyhow::bail!("history_retention_days must be greater than zero")
|
||||
}
|
||||
if !self.inactive_opacity.is_finite() || !(0.0..=1.0).contains(&self.inactive_opacity) {
|
||||
anyhow::bail!("inactive_opacity must be between 0 and 1")
|
||||
}
|
||||
if !matches!(
|
||||
self.log_level.to_ascii_lowercase().as_str(),
|
||||
"trace" | "debug" | "info" | "warn" | "error"
|
||||
@@ -154,7 +183,11 @@ mod tests {
|
||||
assert_eq!(c.max_entry_bytes, 1_048_576);
|
||||
assert_eq!(c.history_retention_days, 30);
|
||||
assert_eq!(c.global_shortcut, "Ctrl+Alt+V");
|
||||
assert!(c.always_on_top);
|
||||
assert!(c.show_window_after_unlock);
|
||||
assert_eq!(c.inactive_opacity, 0.60);
|
||||
assert_eq!(c.theme, Theme::System);
|
||||
assert!(!c.show_timestamps);
|
||||
assert!(c.validate().is_ok());
|
||||
}
|
||||
|
||||
@@ -180,4 +213,15 @@ mod tests {
|
||||
assert!(config.validate().is_ok(), "{shortcut}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_invalid_inactive_opacity() {
|
||||
for inactive_opacity in [-0.01, 1.01, f64::NAN, f64::INFINITY] {
|
||||
let config = Config {
|
||||
inactive_opacity,
|
||||
..Config::default()
|
||||
};
|
||||
assert!(config.validate().is_err(), "{inactive_opacity}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
579
src/gui.rs
579
src/gui.rs
@@ -12,13 +12,13 @@ use std::{
|
||||
use anyhow::{Context, Result};
|
||||
use gtk4::prelude::*;
|
||||
use gtk4::{
|
||||
Application, ApplicationWindow, Box as GtkBox, Button, CheckButton, Entry, Label, ListBox,
|
||||
ListBoxRow, Orientation, ResponseType, ScrolledWindow, TextView,
|
||||
Application, ApplicationWindow, Box as GtkBox, Button, CheckButton, ComboBoxText, Entry, Label,
|
||||
ListBox, ListBoxRow, Orientation, ResponseType, Scale, ScrolledWindow, SpinButton, TextView,
|
||||
};
|
||||
use zeroize::Zeroizing;
|
||||
|
||||
use crate::{
|
||||
config::Config,
|
||||
config::{Config, Theme},
|
||||
core::{highlight_ranges, search},
|
||||
lifecycle::InstanceGuard,
|
||||
platform::{
|
||||
@@ -61,15 +61,14 @@ struct RowActions {
|
||||
delete: Button,
|
||||
}
|
||||
|
||||
const COPY_ICON: &str = "📋";
|
||||
const PASTE_ICON: &str = "↪";
|
||||
const DELETE_ICON: &str = "🗑";
|
||||
const PIN_ICON: &str = "📌";
|
||||
const UNPIN_ICON: &str = "📍";
|
||||
const CLEAR_ICON: &str = "🧹";
|
||||
const PAUSE_ICON: &str = "⏸";
|
||||
const PLAY_ICON: &str = "▶";
|
||||
const HELP_ICON: &str = "❓";
|
||||
const COPY_ICON: &str = "edit-copy-symbolic";
|
||||
const PASTE_ICON: &str = "edit-paste-symbolic";
|
||||
const DELETE_ICON: &str = "user-trash-symbolic";
|
||||
const PIN_ICON: &str = "view-pin-symbolic";
|
||||
const UNPIN_ICON: &str = "edit-undo-symbolic";
|
||||
const CLEAR_ICON: &str = "edit-clear-all-symbolic";
|
||||
const PAUSE_ICON: &str = "media-playback-pause-symbolic";
|
||||
const HELP_ICON: &str = "help-about-symbolic";
|
||||
|
||||
pub fn run(config: Config, instance: InstanceGuard, show_on_start: bool) -> Result<()> {
|
||||
let database_path = Database::default_path();
|
||||
@@ -315,15 +314,30 @@ fn build_window(
|
||||
root.append(&search_box);
|
||||
root.append(&scroll);
|
||||
let actions = GtkBox::new(Orientation::Horizontal, 6);
|
||||
let copy_button = Button::with_label(&format!("{COPY_ICON} Copy"));
|
||||
let paste_button = Button::with_label(&format!("{PASTE_ICON} Paste"));
|
||||
let pin_button = Button::with_label(&format!("{PIN_ICON} Pin / Unpin"));
|
||||
let delete_button = Button::with_label(&format!("{DELETE_ICON} Delete"));
|
||||
let clear_button = Button::with_label(&format!("{CLEAR_ICON} Clear History"));
|
||||
let pause_button = Button::with_label(&format!("{PAUSE_ICON} Pause Recording"));
|
||||
let help_button = Button::with_label(&format!("{HELP_ICON} Help"));
|
||||
let change_passphrase_button = Button::with_label("Change passphrase");
|
||||
actions.add_css_class("footer");
|
||||
let copy_button = Button::with_label("Copy");
|
||||
let paste_button = Button::with_label("Paste");
|
||||
let pin_button = Button::with_label("Pin / Unpin");
|
||||
let delete_button = Button::with_label("Delete");
|
||||
let clear_button = Button::with_label("Clear History");
|
||||
let pause_button = Button::with_label("Pause Recording");
|
||||
let help_button = Button::from_icon_name(HELP_ICON);
|
||||
help_button.set_tooltip_text(Some("Help"));
|
||||
let settings_button = Button::with_label("Settings");
|
||||
copy_button.set_tooltip_text(Some("Copy selected entry"));
|
||||
paste_button.set_tooltip_text(Some("Paste selected entry"));
|
||||
pin_button.set_tooltip_text(Some("Pin or unpin selected entry"));
|
||||
delete_button.set_tooltip_text(Some("Delete selected entry"));
|
||||
clear_button.set_tooltip_text(Some("Clear unpinned clipboard history"));
|
||||
pause_button.set_tooltip_text(Some("Pause or resume clipboard recording"));
|
||||
settings_button.set_tooltip_text(Some("Open settings"));
|
||||
copy_button.set_icon_name(COPY_ICON);
|
||||
paste_button.set_icon_name(PASTE_ICON);
|
||||
pin_button.set_icon_name(PIN_ICON);
|
||||
delete_button.set_icon_name(DELETE_ICON);
|
||||
clear_button.set_icon_name(CLEAR_ICON);
|
||||
pause_button.set_icon_name(PAUSE_ICON);
|
||||
settings_button.set_icon_name("emblem-system-symbolic");
|
||||
let row_actions = RowActions {
|
||||
copy: copy_button.clone(),
|
||||
paste: paste_button.clone(),
|
||||
@@ -340,15 +354,31 @@ fn build_window(
|
||||
&status,
|
||||
&format!("Recording clipboard changes · {hotkey_status}"),
|
||||
);
|
||||
actions.append(©_button);
|
||||
actions.append(&paste_button);
|
||||
actions.append(&pin_button);
|
||||
actions.append(&delete_button);
|
||||
actions.append(&clear_button);
|
||||
actions.append(&pause_button);
|
||||
actions.append(&help_button);
|
||||
actions.append(&change_passphrase_button);
|
||||
actions.append(&settings_button);
|
||||
let entry_actions = GtkBox::new(Orientation::Horizontal, 6);
|
||||
entry_actions.append(&pin_button);
|
||||
entry_actions.append(©_button);
|
||||
entry_actions.append(&paste_button);
|
||||
entry_actions.append(&delete_button);
|
||||
|
||||
let history_actions = GtkBox::new(Orientation::Horizontal, 6);
|
||||
history_actions.append(&pause_button);
|
||||
history_actions.append(&clear_button);
|
||||
|
||||
let utility_actions = GtkBox::new(Orientation::Horizontal, 6);
|
||||
utility_actions.append(&help_button);
|
||||
utility_actions.append(&settings_button);
|
||||
|
||||
let left_spacer = GtkBox::new(Orientation::Horizontal, 0);
|
||||
left_spacer.set_hexpand(true);
|
||||
let right_spacer = GtkBox::new(Orientation::Horizontal, 0);
|
||||
right_spacer.set_hexpand(true);
|
||||
actions.append(&entry_actions);
|
||||
actions.append(&left_spacer);
|
||||
actions.append(&history_actions);
|
||||
actions.append(&right_spacer);
|
||||
actions.append(&utility_actions);
|
||||
delete_button.add_css_class("destructive-action");
|
||||
clear_button.add_css_class("destructive-action");
|
||||
root.append(&actions);
|
||||
root.append(&status);
|
||||
let window = ApplicationWindow::builder()
|
||||
@@ -358,9 +388,63 @@ fn build_window(
|
||||
.default_height(420)
|
||||
.child(&root)
|
||||
.build();
|
||||
let inactive_opacity = Rc::new(std::cell::Cell::new(config.inactive_opacity));
|
||||
let always_on_top = Rc::new(std::cell::Cell::new(config.always_on_top));
|
||||
let clear_search_on_reopen = Rc::new(std::cell::Cell::new(config.clear_search_on_reopen));
|
||||
let show_timestamps = Rc::new(std::cell::Cell::new(config.show_timestamps));
|
||||
let runtime_config = Rc::new(RefCell::new(config.clone()));
|
||||
let css = gtk4::CssProvider::new();
|
||||
css.load_from_data(
|
||||
"button.paused { background-color: #f3a6a6; color: #3d0000; font-weight: bold; } row.pinned { background-color: rgba(79, 107, 237, 0.10); border-radius: 6px; }",
|
||||
"\
|
||||
box.footer { border-top: 1px solid alpha(@theme_fg_color, 0.18); padding-top: 8px; }\
|
||||
.theme-dark box.footer { border-top-color: alpha(#f0f3f6, 0.18); }\
|
||||
.theme-light { color: #1f2328; background-color: #ffffff; }\
|
||||
.theme-light entry, .theme-light textview, .theme-light button { color: #1f2328; background-color: #f6f8fa; }\
|
||||
.theme-light button:hover { background-color: #eaeef2; }\
|
||||
.theme-dark { color: #f0f3f6; background-color: #202124; }\
|
||||
.theme-dark entry, .theme-dark textview, .theme-dark button { color: #f0f3f6; background-color: #2b2d31; }\
|
||||
.theme-dark button:hover { background-color: #3a3d43; }\
|
||||
button.suggested-action { background: @theme_selected_bg_color; color: @theme_selected_fg_color; }\
|
||||
button.suggested-action:hover { background: shade(@theme_selected_bg_color, 1.08); }\
|
||||
button.suggested-action:active { background: shade(@theme_selected_bg_color, 0.90); }\
|
||||
button.destructive-action { background-color: @theme_bg_color; color: #c62828; }\
|
||||
button.destructive-action:hover { background: alpha(#c62828, 0.12); }\
|
||||
button.destructive-action:active { background: alpha(#c62828, 0.22); }\
|
||||
.theme-dark button.destructive-action { background-color: #2b2d31; color: #ff8a80; }\
|
||||
.theme-dark button.destructive-action:hover { background: alpha(#ff8a80, 0.16); }\
|
||||
button:disabled { opacity: 0.55; }\
|
||||
button:focus, entry:focus, spinbutton:focus, combobox:focus { outline: none; box-shadow: none; }\
|
||||
button.paused { background: #f3a6a6; color: #3d0000; font-weight: bold; }\
|
||||
button.paused:hover { background: #f7bcbc; }\
|
||||
.theme-dark button.paused { background: #8a3b12; color: #fff4e5; }\
|
||||
.theme-dark button.paused:hover { background: #a34a19; }\
|
||||
row.pinned { background: #fff4cc; border-left: 3px solid #c58a00; border-radius: 6px; }\
|
||||
.theme-dark row.pinned { background: #3b321f; border-left-color: #e0ad3f; }\
|
||||
.theme-dark list, .theme-dark listbox, .theme-dark listbox row, .theme-dark listbox row label { background-color: #202124; color: #f0f3f6; }\
|
||||
.theme-light list, .theme-light listbox, .theme-light listbox row, .theme-light listbox row label { background-color: #ffffff; color: #1f2328; }\
|
||||
.theme-dark listbox row.pinned { background-color: #3b321f; border-left-color: #e0ad3f; }\
|
||||
.theme-light listbox row.pinned { background-color: #fff4cc; border-left-color: #c58a00; }\
|
||||
.theme-light listbox row:selected, .theme-dark listbox row:selected { background-color: #2f6fed; color: #ffffff; border-left-color: #8db4ff; }\
|
||||
.theme-light listbox row:selected label, .theme-dark listbox row:selected label { color: #ffffff; }\
|
||||
.theme-light listbox row.pinned:selected, .theme-dark listbox row.pinned:selected { background-color: #2f6fed; color: #ffffff; border-left-color: #e0ad3f; }\
|
||||
.theme-light listbox row.pinned:selected > box, .theme-dark listbox row.pinned:selected > box { background-color: #2f6fed; color: #ffffff; }\
|
||||
.theme-light listbox row.pinned:selected label, .theme-dark listbox row.pinned:selected label { color: #ffffff; }\
|
||||
listbox row:selected { background-color: #2f6fed; color: #ffffff; border-left-color: #8db4ff; }\
|
||||
listbox row:selected label { color: #ffffff; }\
|
||||
listbox row.pinned:selected { background-color: #2f6fed; color: #ffffff; border-left-color: #e0ad3f; }\
|
||||
listbox row.pinned:selected > box { background-color: #2f6fed; color: #ffffff; }\
|
||||
listbox row.pinned:selected label { color: #ffffff; }\
|
||||
row.selected-entry, row.selected-entry > box, box.selected-entry { background-color: #2f6fed; color: #ffffff; }\
|
||||
row.selected-entry label { color: #ffffff; }\
|
||||
row.pinned.selected-entry { border-left-color: #e0ad3f; }\
|
||||
label.status { padding: 4px 8px; border-radius: 6px; color: @theme_unfocused_fg_color; }\
|
||||
label.status.success { color: #16803c; }\
|
||||
label.status.warning { color: #a15c00; }\
|
||||
label.status.error { color: #c62828; }\
|
||||
.theme-dark label.status.success { color: #72d492; }\
|
||||
.theme-dark label.status.warning { color: #ffbf69; }\
|
||||
.theme-dark label.status.error { color: #ff8a80; }\
|
||||
",
|
||||
);
|
||||
if let Some(display) = gtk4::gdk::Display::default() {
|
||||
gtk4::style_context_add_provider_for_display(
|
||||
@@ -369,21 +453,42 @@ fn build_window(
|
||||
gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION,
|
||||
);
|
||||
}
|
||||
apply_theme(&root, &config.theme);
|
||||
let window_for_opacity = window.clone();
|
||||
let inactive_opacity_for_realize = Rc::clone(&inactive_opacity);
|
||||
let always_on_top_for_realize = Rc::clone(&always_on_top);
|
||||
window.connect_realize(move |_| {
|
||||
crate::platform::linux::x11_window::configure(&window_for_opacity);
|
||||
crate::platform::linux::x11_window::configure(
|
||||
&window_for_opacity,
|
||||
inactive_opacity_for_realize.get(),
|
||||
always_on_top_for_realize.get(),
|
||||
);
|
||||
});
|
||||
let window_for_above = window.clone();
|
||||
let inactive_opacity_for_map = Rc::clone(&inactive_opacity);
|
||||
let always_on_top_for_map = Rc::clone(&always_on_top);
|
||||
window.connect_map(move |_| {
|
||||
crate::platform::linux::x11_window::configure(&window_for_above);
|
||||
crate::platform::linux::x11_window::configure(
|
||||
&window_for_above,
|
||||
inactive_opacity_for_map.get(),
|
||||
always_on_top_for_map.get(),
|
||||
);
|
||||
});
|
||||
let window_for_opacity = window.clone();
|
||||
let inactive_opacity_for_active = Rc::clone(&inactive_opacity);
|
||||
window.connect_is_active_notify(move |_| {
|
||||
crate::platform::linux::x11_window::set_active_opacity(&window_for_opacity);
|
||||
crate::platform::linux::x11_window::set_active_opacity(
|
||||
&window_for_opacity,
|
||||
inactive_opacity_for_active.get(),
|
||||
);
|
||||
});
|
||||
let window_for_opacity = window.clone();
|
||||
let inactive_opacity_for_timeout = Rc::clone(&inactive_opacity);
|
||||
glib::timeout_add_local(std::time::Duration::from_millis(100), move || {
|
||||
crate::platform::linux::x11_window::set_active_opacity(&window_for_opacity);
|
||||
crate::platform::linux::x11_window::set_active_opacity(
|
||||
&window_for_opacity,
|
||||
inactive_opacity_for_timeout.get(),
|
||||
);
|
||||
glib::ControlFlow::Continue
|
||||
});
|
||||
let recording = state.borrow().recording;
|
||||
@@ -402,7 +507,28 @@ fn build_window(
|
||||
});
|
||||
window.set_visible(show_on_start);
|
||||
list.set_activate_on_single_click(false);
|
||||
refresh_list(&list, &state.borrow().entries, "", Some(&row_actions));
|
||||
let clear_selection_click = gtk4::GestureClick::new();
|
||||
clear_selection_click.set_button(0);
|
||||
let list_for_clear_selection = list.clone();
|
||||
clear_selection_click.connect_pressed(move |_, _, _, y| {
|
||||
if list_for_clear_selection.row_at_y(y as i32).is_none() {
|
||||
list_for_clear_selection.select_row(None::<&ListBoxRow>);
|
||||
}
|
||||
});
|
||||
list.add_controller(clear_selection_click);
|
||||
refresh_list(
|
||||
&list,
|
||||
&state.borrow().entries,
|
||||
"",
|
||||
show_timestamps.get(),
|
||||
Some(&row_actions),
|
||||
);
|
||||
update_action_sensitivity(&list, &row_actions);
|
||||
let actions_for_selection = row_actions.clone();
|
||||
list.connect_selected_rows_changed(move |list| {
|
||||
update_action_sensitivity(list, &actions_for_selection);
|
||||
update_selection_visuals(list);
|
||||
});
|
||||
let window_for_details = window.clone();
|
||||
let state_for_details = Rc::clone(&state);
|
||||
list.connect_row_activated(move |_, row| {
|
||||
@@ -428,6 +554,7 @@ fn build_window(
|
||||
let list_for_search = list.clone();
|
||||
let state_for_search = Rc::clone(&state);
|
||||
let row_actions_for_search = row_actions.clone();
|
||||
let show_timestamps_for_search = Rc::clone(&show_timestamps);
|
||||
search_box.connect_changed(move |entry| {
|
||||
let mut state = state_for_search.borrow_mut();
|
||||
state.search_query = entry.text().to_string();
|
||||
@@ -435,6 +562,7 @@ fn build_window(
|
||||
&list_for_search,
|
||||
&state.entries,
|
||||
&state.search_query,
|
||||
show_timestamps_for_search.get(),
|
||||
Some(&row_actions_for_search),
|
||||
);
|
||||
});
|
||||
@@ -442,6 +570,7 @@ fn build_window(
|
||||
let list_for_keys = list.clone();
|
||||
let window_for_keys = window.clone();
|
||||
let row_actions_for_keys = row_actions.clone();
|
||||
let show_timestamps_for_keys = Rc::clone(&show_timestamps);
|
||||
let delete_button_for_keys = delete_button.clone();
|
||||
let keys = gtk4::EventControllerKey::new();
|
||||
keys.set_propagation_phase(gtk4::PropagationPhase::Capture);
|
||||
@@ -502,6 +631,7 @@ fn build_window(
|
||||
&list_for_keys,
|
||||
&state.entries,
|
||||
&state.search_query,
|
||||
show_timestamps_for_keys.get(),
|
||||
Some(&row_actions_for_keys),
|
||||
);
|
||||
}
|
||||
@@ -570,6 +700,7 @@ fn build_window(
|
||||
&list_for_keys,
|
||||
&state.entries,
|
||||
&state.search_query,
|
||||
show_timestamps_for_keys.get(),
|
||||
Some(&row_actions_for_keys),
|
||||
);
|
||||
return glib::Propagation::Stop;
|
||||
@@ -643,6 +774,7 @@ fn build_window(
|
||||
let pinned_list = list.clone();
|
||||
let status_for_pin = status.clone();
|
||||
let row_actions_for_pin = row_actions.clone();
|
||||
let show_timestamps_for_pin = Rc::clone(&show_timestamps);
|
||||
pin_button.connect_clicked(move |_| {
|
||||
if let Some(id) = selected_id(&list_for_pin) {
|
||||
let mut state = state_for_pin.borrow_mut();
|
||||
@@ -655,6 +787,7 @@ fn build_window(
|
||||
&pinned_list,
|
||||
&state.entries,
|
||||
&state.search_query,
|
||||
show_timestamps_for_pin.get(),
|
||||
Some(&row_actions_for_pin),
|
||||
);
|
||||
}
|
||||
@@ -672,6 +805,7 @@ fn build_window(
|
||||
let status_for_delete = status.clone();
|
||||
let row_actions_for_delete = row_actions.clone();
|
||||
let window_for_delete = window.clone();
|
||||
let show_timestamps_for_delete = Rc::clone(&show_timestamps);
|
||||
delete_button.connect_clicked(move |_| {
|
||||
if let Some(id) = selected_id(&list_for_delete) {
|
||||
confirm_delete(
|
||||
@@ -681,6 +815,7 @@ fn build_window(
|
||||
deleted_list.clone(),
|
||||
status_for_delete.clone(),
|
||||
row_actions_for_delete.clone(),
|
||||
show_timestamps_for_delete.get(),
|
||||
);
|
||||
}
|
||||
});
|
||||
@@ -689,25 +824,26 @@ fn build_window(
|
||||
let shortcut_for_help = config.global_shortcut.clone();
|
||||
help_button.connect_clicked(move |_| show_help(&window_for_help, &shortcut_for_help));
|
||||
|
||||
let window_for_passphrase = window.clone();
|
||||
let state_for_passphrase = Rc::clone(&state);
|
||||
let status_for_passphrase = status.clone();
|
||||
change_passphrase_button.connect_clicked(move |_| {
|
||||
change_passphrase(
|
||||
&window_for_passphrase,
|
||||
Rc::clone(&state_for_passphrase),
|
||||
&status_for_passphrase,
|
||||
);
|
||||
});
|
||||
|
||||
let window_for_settings = window.clone();
|
||||
let config_for_settings = config.clone();
|
||||
let root_for_settings = root.clone();
|
||||
let config_for_settings = Rc::clone(&runtime_config);
|
||||
let status_for_settings = status.clone();
|
||||
let inactive_opacity_for_settings = Rc::clone(&inactive_opacity);
|
||||
let always_on_top_for_settings = Rc::clone(&always_on_top);
|
||||
let clear_search_for_settings = Rc::clone(&clear_search_on_reopen);
|
||||
let show_timestamps_for_settings = Rc::clone(&show_timestamps);
|
||||
let state_for_settings = Rc::clone(&state);
|
||||
settings_button.connect_clicked(move |_| {
|
||||
show_settings(
|
||||
&window_for_settings,
|
||||
&config_for_settings,
|
||||
&root_for_settings,
|
||||
Rc::clone(&config_for_settings),
|
||||
Rc::clone(&state_for_settings),
|
||||
&status_for_settings,
|
||||
Rc::clone(&inactive_opacity_for_settings),
|
||||
Rc::clone(&always_on_top_for_settings),
|
||||
Rc::clone(&clear_search_for_settings),
|
||||
Rc::clone(&show_timestamps_for_settings),
|
||||
);
|
||||
});
|
||||
|
||||
@@ -715,23 +851,17 @@ fn build_window(
|
||||
let cleared_list = list.clone();
|
||||
let status_for_clear = status.clone();
|
||||
let row_actions_for_clear = row_actions.clone();
|
||||
let window_for_clear = window.clone();
|
||||
let show_timestamps_for_clear = Rc::clone(&show_timestamps);
|
||||
clear_button.connect_clicked(move |_| {
|
||||
let mut state = state_for_clear.borrow_mut();
|
||||
match state.database.clear_history() {
|
||||
Ok(()) => {
|
||||
state.entries.retain(|entry| entry.pinned);
|
||||
refresh_list(
|
||||
&cleared_list,
|
||||
&state.entries,
|
||||
&state.search_query,
|
||||
Some(&row_actions_for_clear),
|
||||
);
|
||||
}
|
||||
Err(error) => {
|
||||
tracing::error!(%error, "failed to clear unpinned clipboard history");
|
||||
set_status(&status_for_clear, "Could not clear clipboard history");
|
||||
}
|
||||
}
|
||||
confirm_clear_history(
|
||||
&window_for_clear,
|
||||
Rc::clone(&state_for_clear),
|
||||
cleared_list.clone(),
|
||||
status_for_clear.clone(),
|
||||
row_actions_for_clear.clone(),
|
||||
show_timestamps_for_clear.get(),
|
||||
);
|
||||
});
|
||||
|
||||
let state_for_pause = Rc::clone(&state);
|
||||
@@ -765,7 +895,7 @@ fn build_window(
|
||||
|
||||
let state_for_watch = Rc::clone(&state);
|
||||
let list_for_watch = list.clone();
|
||||
let config_for_watch = config.clone();
|
||||
let config_for_watch = Rc::clone(&runtime_config);
|
||||
let row_actions_for_watch = row_actions.clone();
|
||||
let window_for_events = window.clone();
|
||||
let search_for_events = search_box.clone();
|
||||
@@ -781,6 +911,9 @@ fn build_window(
|
||||
if window_for_events.is_visible() {
|
||||
window_for_events.set_visible(false);
|
||||
} else {
|
||||
if clear_search_on_reopen.get() {
|
||||
search_for_events.set_text("");
|
||||
}
|
||||
request_focus(&mut state);
|
||||
window_for_events.present();
|
||||
search_for_events.grab_focus();
|
||||
@@ -790,6 +923,9 @@ fn build_window(
|
||||
if window_for_events.is_visible() {
|
||||
window_for_events.set_visible(false);
|
||||
} else {
|
||||
if clear_search_on_reopen.get() {
|
||||
search_for_events.set_text("");
|
||||
}
|
||||
request_focus(&mut state);
|
||||
window_for_events.present();
|
||||
search_for_events.grab_focus();
|
||||
@@ -807,7 +943,7 @@ fn build_window(
|
||||
&mut state,
|
||||
result,
|
||||
&list_for_watch,
|
||||
&config_for_watch,
|
||||
&config_for_watch.borrow(),
|
||||
&row_actions_for_watch,
|
||||
);
|
||||
}
|
||||
@@ -893,6 +1029,14 @@ fn process_clipboard_result(
|
||||
&& !content.trim().is_empty()
|
||||
&& content.len() <= config.max_entry_bytes =>
|
||||
{
|
||||
if config
|
||||
.ignored_patterns
|
||||
.iter()
|
||||
.any(|pattern| content.contains(pattern))
|
||||
{
|
||||
tracing::debug!("ignored clipboard entry matching a privacy pattern");
|
||||
return;
|
||||
}
|
||||
match state.database.upsert_content(&content, now()) {
|
||||
Ok(entry) => {
|
||||
if let Err(error) = state.database.trim_unpinned(config.history_limit) {
|
||||
@@ -900,7 +1044,13 @@ fn process_clipboard_result(
|
||||
}
|
||||
state.entries.retain(|candidate| candidate.id != entry.id);
|
||||
state.entries.push(entry);
|
||||
refresh_list(list, &state.entries, &state.search_query, Some(actions));
|
||||
refresh_list(
|
||||
list,
|
||||
&state.entries,
|
||||
&state.search_query,
|
||||
config.show_timestamps,
|
||||
Some(actions),
|
||||
);
|
||||
}
|
||||
Err(error) => {
|
||||
tracing::error!(%error, "failed to store clipboard entry");
|
||||
@@ -925,9 +1075,70 @@ fn request_focus(state: &mut UiState) {
|
||||
}
|
||||
|
||||
fn set_status(label: &Label, message: &str) {
|
||||
label.remove_css_class("success");
|
||||
label.remove_css_class("warning");
|
||||
label.remove_css_class("error");
|
||||
let lower = message.to_ascii_lowercase();
|
||||
if lower.contains("could not") || lower.contains("failed") || lower.contains("unavailable") {
|
||||
label.add_css_class("error");
|
||||
} else if lower.contains("paused") {
|
||||
label.add_css_class("warning");
|
||||
} else if lower.contains("saved")
|
||||
|| lower.contains("copied")
|
||||
|| lower.contains("pasted")
|
||||
|| lower.contains("deleted")
|
||||
|| lower.contains("successfully")
|
||||
{
|
||||
label.add_css_class("success");
|
||||
}
|
||||
label.set_text(&format!("[{}] {message}", now_local_human()));
|
||||
}
|
||||
|
||||
fn update_action_sensitivity(list: &ListBox, actions: &RowActions) {
|
||||
let enabled = selected_id(list).is_some();
|
||||
actions.copy.set_sensitive(enabled);
|
||||
actions.paste.set_sensitive(enabled);
|
||||
actions.pin.set_sensitive(enabled);
|
||||
actions.delete.set_sensitive(enabled);
|
||||
}
|
||||
|
||||
fn update_selection_visuals(list: &ListBox) {
|
||||
let selected = selected_id(list);
|
||||
let mut child = list.first_child();
|
||||
while let Some(widget) = child {
|
||||
child = widget.next_sibling();
|
||||
let Ok(row) = widget.downcast::<ListBoxRow>() else {
|
||||
continue;
|
||||
};
|
||||
let is_selected = row
|
||||
.tooltip_text()
|
||||
.and_then(|tooltip| tooltip.parse::<i64>().ok())
|
||||
== selected;
|
||||
if is_selected {
|
||||
row.add_css_class("selected-entry");
|
||||
} else {
|
||||
row.remove_css_class("selected-entry");
|
||||
}
|
||||
if let Some(content) = row.child() {
|
||||
if is_selected {
|
||||
content.add_css_class("selected-entry");
|
||||
} else {
|
||||
content.remove_css_class("selected-entry");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn apply_theme(root: &GtkBox, theme: &Theme) {
|
||||
root.remove_css_class("theme-light");
|
||||
root.remove_css_class("theme-dark");
|
||||
match theme {
|
||||
Theme::Light => root.add_css_class("theme-light"),
|
||||
Theme::Dark => root.add_css_class("theme-dark"),
|
||||
Theme::System => {}
|
||||
}
|
||||
}
|
||||
|
||||
fn update_recording_visuals(
|
||||
button: &Button,
|
||||
window: &ApplicationWindow,
|
||||
@@ -936,11 +1147,16 @@ fn update_recording_visuals(
|
||||
tray: Option<&crate::tray::TrayHandle>,
|
||||
) {
|
||||
let button_label = if recording {
|
||||
format!("{PAUSE_ICON} Pause Recording")
|
||||
"Pause Recording".to_owned()
|
||||
} else {
|
||||
format!("{PLAY_ICON} Resume Recording")
|
||||
"Resume Recording".to_owned()
|
||||
};
|
||||
button.set_label(&button_label);
|
||||
button.set_icon_name(if recording {
|
||||
PAUSE_ICON
|
||||
} else {
|
||||
"media-playback-start-symbolic"
|
||||
});
|
||||
if recording {
|
||||
button.remove_css_class("paused");
|
||||
} else {
|
||||
@@ -961,6 +1177,7 @@ fn refresh_list(
|
||||
list: &ListBox,
|
||||
entries: &[crate::core::Entry],
|
||||
query: &str,
|
||||
show_timestamps: bool,
|
||||
actions: Option<&RowActions>,
|
||||
) {
|
||||
let selected = selected_id(list);
|
||||
@@ -974,12 +1191,21 @@ fn refresh_list(
|
||||
} else {
|
||||
preview
|
||||
};
|
||||
let pinned_prefix = if entry.pinned { "📌 " } else { "" };
|
||||
let pinned_prefix = if entry.pinned { "Pinned · " } else { "" };
|
||||
let ranges = highlight_ranges(&preview, query);
|
||||
let timestamp = if show_timestamps {
|
||||
format!(
|
||||
"<span alpha=\"70%\"> · {}</span>",
|
||||
local_human(entry.created_at)
|
||||
)
|
||||
} else {
|
||||
String::new()
|
||||
};
|
||||
let markup = format!(
|
||||
"{}{}",
|
||||
"{}{}{}",
|
||||
glib::markup_escape_text(pinned_prefix),
|
||||
highlighted_markup(&preview, &ranges)
|
||||
highlighted_markup(&preview, &ranges),
|
||||
timestamp,
|
||||
);
|
||||
let label = Label::new(None);
|
||||
label.set_markup(&markup);
|
||||
@@ -992,7 +1218,8 @@ fn refresh_list(
|
||||
let row = ListBoxRow::new();
|
||||
let content = GtkBox::new(Orientation::Horizontal, 4);
|
||||
if let Some(actions) = actions {
|
||||
let pin_button = Button::with_label(if entry.pinned { UNPIN_ICON } else { PIN_ICON });
|
||||
let pin_button =
|
||||
Button::from_icon_name(if entry.pinned { UNPIN_ICON } else { PIN_ICON });
|
||||
pin_button.set_tooltip_text(Some(if entry.pinned {
|
||||
"Unpin entry"
|
||||
} else {
|
||||
@@ -1016,7 +1243,7 @@ fn refresh_list(
|
||||
(PASTE_ICON, "Paste entry", actions.paste.clone()),
|
||||
(DELETE_ICON, "Delete entry", actions.delete.clone()),
|
||||
] {
|
||||
let button = Button::with_label(icon);
|
||||
let button = Button::from_icon_name(icon);
|
||||
button.set_tooltip_text(Some(tooltip));
|
||||
button.set_focus_on_click(false);
|
||||
let row_for_action = row.clone();
|
||||
@@ -1045,6 +1272,7 @@ fn refresh_list(
|
||||
empty.set_margin_start(8);
|
||||
list.append(&empty);
|
||||
}
|
||||
update_selection_visuals(list);
|
||||
}
|
||||
|
||||
fn selected_id(list: &ListBox) -> Option<i64> {
|
||||
@@ -1059,7 +1287,7 @@ fn highlighted_markup(text: &str, ranges: &[(usize, usize)]) -> String {
|
||||
continue;
|
||||
}
|
||||
markup.push_str(&glib::markup_escape_text(&text[cursor..start]));
|
||||
markup.push_str("<span background=\"#ffe680\" foreground=\"#000000\">");
|
||||
markup.push_str("<span weight=\"bold\" underline=\"single\">");
|
||||
markup.push_str(&glib::markup_escape_text(&text[start..end]));
|
||||
markup.push_str("</span>");
|
||||
cursor = end;
|
||||
@@ -1096,7 +1324,19 @@ fn show_text_dialog(window: &ApplicationWindow, title: &str, content: &str) {
|
||||
dialog.present();
|
||||
}
|
||||
|
||||
fn show_settings(window: &ApplicationWindow, config: &Config, status: &Label) {
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
fn show_settings(
|
||||
window: &ApplicationWindow,
|
||||
root: &GtkBox,
|
||||
config: Rc<RefCell<Config>>,
|
||||
state: Rc<RefCell<UiState>>,
|
||||
status: &Label,
|
||||
inactive_opacity: Rc<std::cell::Cell<f64>>,
|
||||
always_on_top: Rc<std::cell::Cell<bool>>,
|
||||
clear_search_on_reopen: Rc<std::cell::Cell<bool>>,
|
||||
show_timestamps: Rc<std::cell::Cell<bool>>,
|
||||
) {
|
||||
let current_config = config.borrow().clone();
|
||||
let dialog = gtk4::Dialog::builder()
|
||||
.transient_for(window)
|
||||
.modal(true)
|
||||
@@ -1109,24 +1349,149 @@ fn show_settings(window: &ApplicationWindow, config: &Config, status: &Label) {
|
||||
content.set_margin_start(18);
|
||||
content.set_margin_end(18);
|
||||
let show_window = CheckButton::with_label("Show the Cliphoard window after unlock");
|
||||
show_window.set_active(config.show_window_after_unlock);
|
||||
show_window.set_active(current_config.show_window_after_unlock);
|
||||
content.append(&show_window);
|
||||
let keep_on_top = CheckButton::with_label("Always keep the popup in the foreground");
|
||||
keep_on_top.set_active(always_on_top.get());
|
||||
content.append(&keep_on_top);
|
||||
let clear_search = CheckButton::with_label("Clear the search field when reopening");
|
||||
clear_search.set_active(clear_search_on_reopen.get());
|
||||
content.append(&clear_search);
|
||||
let timestamps = CheckButton::with_label("Show entry timestamps");
|
||||
timestamps.set_active(current_config.show_timestamps);
|
||||
content.append(×tamps);
|
||||
let theme_label = Label::new(Some("Appearance"));
|
||||
theme_label.set_xalign(0.0);
|
||||
theme_label.add_css_class("heading");
|
||||
content.append(&theme_label);
|
||||
let theme = ComboBoxText::new();
|
||||
theme.append(Some("system"), "System");
|
||||
theme.append(Some("light"), "Light");
|
||||
theme.append(Some("dark"), "Dark");
|
||||
theme.set_active_id(Some(match ¤t_config.theme {
|
||||
Theme::System => "system",
|
||||
Theme::Light => "light",
|
||||
Theme::Dark => "dark",
|
||||
}));
|
||||
theme.set_tooltip_text(Some("Choose whether Cliphoard follows the system theme"));
|
||||
content.append(&theme);
|
||||
let explanation = Label::new(Some(
|
||||
"When disabled, Cliphoard starts in the tray after you enter the passphrase. You can still open the window with the global shortcut.",
|
||||
"When disabled, Cliphoard starts in the tray after you enter the passphrase. You can still open the window with the global shortcut. Shortcut, autostart, and history-limit changes apply after restart.",
|
||||
));
|
||||
explanation.set_wrap(true);
|
||||
content.append(&explanation);
|
||||
let opacity_label = Label::new(Some("Opacity when unfocused"));
|
||||
content.append(&opacity_label);
|
||||
let opacity = Scale::with_range(Orientation::Horizontal, 0.0, 100.0, 1.0);
|
||||
opacity.set_value(inactive_opacity.get() * 100.0);
|
||||
opacity.set_digits(0);
|
||||
opacity.set_draw_value(true);
|
||||
opacity.set_hexpand(true);
|
||||
opacity.set_tooltip_text(Some("How transparent the popup is when it is not focused"));
|
||||
content.append(&opacity);
|
||||
let shortcut_label = Label::new(Some("Global shortcut (applies after restart)"));
|
||||
content.append(&shortcut_label);
|
||||
let shortcut = Entry::new();
|
||||
shortcut.set_text(¤t_config.global_shortcut);
|
||||
shortcut.set_tooltip_text(Some("For example: Ctrl+Alt+V"));
|
||||
content.append(&shortcut);
|
||||
let autostart = CheckButton::with_label("Start Cliphoard automatically when I log in");
|
||||
autostart.set_active(current_config.autostart);
|
||||
content.append(&autostart);
|
||||
let history_limit_label = Label::new(Some("Maximum unpinned history entries"));
|
||||
content.append(&history_limit_label);
|
||||
let history_limit = SpinButton::with_range(1.0, 10_000.0, 1.0);
|
||||
history_limit.set_value(current_config.history_limit as f64);
|
||||
content.append(&history_limit);
|
||||
let pinned_limit_label = Label::new(Some("Maximum pinned entries"));
|
||||
content.append(&pinned_limit_label);
|
||||
let pinned_limit = SpinButton::with_range(1.0, 10_000.0, 1.0);
|
||||
pinned_limit.set_value(current_config.pinned_limit as f64);
|
||||
content.append(&pinned_limit);
|
||||
let retention_label = Label::new(Some("Remove unpinned entries older than (days)"));
|
||||
content.append(&retention_label);
|
||||
let retention_days = SpinButton::with_range(1.0, 3_650.0, 1.0);
|
||||
retention_days.set_value(current_config.history_retention_days as f64);
|
||||
content.append(&retention_days);
|
||||
let ignored_label = Label::new(Some(
|
||||
"Ignore clipboard entries containing (comma-separated)",
|
||||
));
|
||||
content.append(&ignored_label);
|
||||
let ignored_patterns = Entry::new();
|
||||
ignored_patterns.set_text(¤t_config.ignored_patterns.join(", "));
|
||||
ignored_patterns.set_tooltip_text(Some("For example: password, secret-token"));
|
||||
content.append(&ignored_patterns);
|
||||
let change_passphrase_button = Button::with_label("Change passphrase");
|
||||
change_passphrase_button.set_icon_name("dialog-password-symbolic");
|
||||
change_passphrase_button.set_tooltip_text(Some("Change the database passphrase"));
|
||||
content.append(&change_passphrase_button);
|
||||
let window_for_passphrase = window.clone();
|
||||
let state_for_passphrase = Rc::clone(&state);
|
||||
let status_for_passphrase = status.clone();
|
||||
change_passphrase_button.connect_clicked(move |_| {
|
||||
change_passphrase(
|
||||
&window_for_passphrase,
|
||||
Rc::clone(&state_for_passphrase),
|
||||
&status_for_passphrase,
|
||||
);
|
||||
});
|
||||
dialog.content_area().append(&content);
|
||||
dialog.add_button("Cancel", ResponseType::Cancel);
|
||||
dialog.add_button("Save", ResponseType::Accept);
|
||||
let config_for_response = config.clone();
|
||||
let config_for_response = Rc::clone(&config);
|
||||
let status_for_response = status.clone();
|
||||
let window_for_response = window.clone();
|
||||
let root_for_response = root.clone();
|
||||
dialog.connect_response(move |dialog, response| {
|
||||
if response == ResponseType::Accept {
|
||||
let mut updated_config = config_for_response.clone();
|
||||
let mut updated_config = config_for_response.borrow().clone();
|
||||
updated_config.show_window_after_unlock = show_window.is_active();
|
||||
updated_config.always_on_top = keep_on_top.is_active();
|
||||
updated_config.clear_search_on_reopen = clear_search.is_active();
|
||||
updated_config.show_timestamps = timestamps.is_active();
|
||||
updated_config.theme = match theme.active_id().as_deref() {
|
||||
Some("light") => Theme::Light,
|
||||
Some("dark") => Theme::Dark,
|
||||
_ => Theme::System,
|
||||
};
|
||||
updated_config.inactive_opacity = opacity.value() / 100.0;
|
||||
updated_config.global_shortcut = shortcut.text().to_string();
|
||||
updated_config.autostart = autostart.is_active();
|
||||
updated_config.history_limit = history_limit.value_as_int() as usize;
|
||||
updated_config.pinned_limit = pinned_limit.value_as_int() as usize;
|
||||
updated_config.history_retention_days = retention_days.value_as_int() as u64;
|
||||
updated_config.ignored_patterns = ignored_patterns
|
||||
.text()
|
||||
.split(',')
|
||||
.map(str::trim)
|
||||
.filter(|pattern| !pattern.is_empty())
|
||||
.map(str::to_owned)
|
||||
.collect();
|
||||
if let Err(error) = updated_config.validate() {
|
||||
set_status(
|
||||
&status_for_response,
|
||||
&format!("Could not save settings: {error}"),
|
||||
);
|
||||
return;
|
||||
}
|
||||
match updated_config.save() {
|
||||
Ok(()) => set_status(&status_for_response, "Settings saved"),
|
||||
Ok(()) => {
|
||||
*config_for_response.borrow_mut() = updated_config.clone();
|
||||
inactive_opacity.set(updated_config.inactive_opacity);
|
||||
always_on_top.set(updated_config.always_on_top);
|
||||
clear_search_on_reopen.set(updated_config.clear_search_on_reopen);
|
||||
show_timestamps.set(updated_config.show_timestamps);
|
||||
apply_theme(&root_for_response, &updated_config.theme);
|
||||
crate::platform::linux::x11_window::set_active_opacity(
|
||||
&window_for_response,
|
||||
updated_config.inactive_opacity,
|
||||
);
|
||||
crate::platform::linux::x11_window::set_always_on_top(
|
||||
&window_for_response,
|
||||
updated_config.always_on_top,
|
||||
);
|
||||
set_status(&status_for_response, "Settings saved");
|
||||
}
|
||||
Err(error) => set_status(
|
||||
&status_for_response,
|
||||
&format!("Could not save settings: {error}"),
|
||||
@@ -1233,6 +1598,49 @@ removal commands. The tray menu includes Quit Cliphoard.\n",
|
||||
show_text_dialog(window, "Cliphoard help", &help);
|
||||
}
|
||||
|
||||
fn confirm_clear_history(
|
||||
window: &ApplicationWindow,
|
||||
state: Rc<RefCell<UiState>>,
|
||||
list: ListBox,
|
||||
status: Label,
|
||||
actions: RowActions,
|
||||
show_timestamps: bool,
|
||||
) {
|
||||
let dialog = gtk4::Dialog::builder()
|
||||
.transient_for(window)
|
||||
.modal(true)
|
||||
.title("Clear clipboard history?")
|
||||
.build();
|
||||
let message = Label::new(Some(
|
||||
"This permanently removes all unpinned clipboard entries. Pinned entries will be kept.",
|
||||
));
|
||||
message.set_wrap(true);
|
||||
dialog.content_area().append(&message);
|
||||
dialog.add_button("Cancel", ResponseType::Cancel);
|
||||
let clear = dialog.add_button("Clear History", ResponseType::Accept);
|
||||
clear.add_css_class("destructive-action");
|
||||
dialog.connect_response(move |dialog, response| {
|
||||
if response == ResponseType::Accept {
|
||||
let mut state = state.borrow_mut();
|
||||
match state.database.clear_history() {
|
||||
Ok(()) => {
|
||||
state.entries.retain(|entry| entry.pinned);
|
||||
let entries = state.entries.clone();
|
||||
let query = state.search_query.clone();
|
||||
refresh_list(&list, &entries, &query, show_timestamps, Some(&actions));
|
||||
set_status(&status, "Cleared unpinned clipboard history");
|
||||
}
|
||||
Err(error) => {
|
||||
tracing::error!(%error, "failed to clear unpinned clipboard history");
|
||||
set_status(&status, "Could not clear clipboard history");
|
||||
}
|
||||
}
|
||||
}
|
||||
dialog.close();
|
||||
});
|
||||
dialog.present();
|
||||
}
|
||||
|
||||
fn confirm_delete(
|
||||
window: &ApplicationWindow,
|
||||
id: i64,
|
||||
@@ -1240,6 +1648,7 @@ fn confirm_delete(
|
||||
list: ListBox,
|
||||
status: Label,
|
||||
actions: RowActions,
|
||||
show_timestamps: bool,
|
||||
) {
|
||||
let dialog = gtk4::Dialog::builder()
|
||||
.transient_for(window)
|
||||
@@ -1259,7 +1668,7 @@ fn confirm_delete(
|
||||
state.entries.retain(|entry| entry.id != id);
|
||||
let entries = state.entries.clone();
|
||||
let query = state.search_query.clone();
|
||||
refresh_list(&list, &entries, &query, Some(&actions));
|
||||
refresh_list(&list, &entries, &query, show_timestamps, Some(&actions));
|
||||
set_status(&status, "Deleted clipboard entry");
|
||||
}
|
||||
Err(error) => {
|
||||
@@ -1281,7 +1690,11 @@ fn now() -> i64 {
|
||||
}
|
||||
|
||||
fn now_local_human() -> String {
|
||||
let seconds = now() as libc::time_t;
|
||||
local_human(now())
|
||||
}
|
||||
|
||||
fn local_human(timestamp: i64) -> String {
|
||||
let seconds = timestamp as libc::time_t;
|
||||
let mut local = std::mem::MaybeUninit::<libc::tm>::uninit();
|
||||
if unsafe { libc::localtime_r(&seconds, local.as_mut_ptr()) }.is_null() {
|
||||
return seconds.to_string();
|
||||
|
||||
@@ -9,10 +9,13 @@ use x11rb::{
|
||||
};
|
||||
|
||||
const ACTIVE_OPACITY: f64 = 1.0;
|
||||
const INACTIVE_OPACITY: f64 = 0.60;
|
||||
|
||||
pub fn configure(window: &ApplicationWindow) {
|
||||
set_active_opacity(window);
|
||||
pub fn configure(window: &ApplicationWindow, inactive_opacity: f64, always_on_top: bool) {
|
||||
set_active_opacity(window, inactive_opacity);
|
||||
set_always_on_top(window, always_on_top);
|
||||
}
|
||||
|
||||
pub fn set_always_on_top(window: &ApplicationWindow, always_on_top: bool) {
|
||||
let Some(surface) = window.surface() else {
|
||||
return;
|
||||
};
|
||||
@@ -37,15 +40,6 @@ pub fn configure(window: &ApplicationWindow) {
|
||||
let Ok(above) = above_cookie.reply() else {
|
||||
return;
|
||||
};
|
||||
if let Err(error) = connection.change_property32(
|
||||
x11rb::protocol::xproto::PropMode::REPLACE,
|
||||
xid,
|
||||
state.atom,
|
||||
x11rb::protocol::xproto::AtomEnum::ATOM,
|
||||
&[above.atom],
|
||||
) {
|
||||
tracing::warn!(%error, "could not mark popup as always on top");
|
||||
}
|
||||
let root = connection.setup().roots[0].root;
|
||||
let event = ClientMessageEvent {
|
||||
response_type: CLIENT_MESSAGE_EVENT,
|
||||
@@ -53,7 +47,7 @@ pub fn configure(window: &ApplicationWindow) {
|
||||
sequence: 0,
|
||||
window: xid,
|
||||
type_: state.atom,
|
||||
data: ClientMessageData::from([1, above.atom, 0, 0, 0]),
|
||||
data: ClientMessageData::from([if always_on_top { 1 } else { 0 }, above.atom, 0, 0, 0]),
|
||||
};
|
||||
match connection.send_event(
|
||||
false,
|
||||
@@ -63,15 +57,17 @@ pub fn configure(window: &ApplicationWindow) {
|
||||
) {
|
||||
Ok(cookie) => {
|
||||
if let Err(error) = cookie.check() {
|
||||
tracing::debug!(%error, "window manager rejected always-on-top request");
|
||||
tracing::debug!(%error, always_on_top, "window manager rejected always-on-top request");
|
||||
}
|
||||
}
|
||||
Err(error) => tracing::debug!(%error, "could not send always-on-top request"),
|
||||
Err(error) => {
|
||||
tracing::debug!(%error, always_on_top, "could not send always-on-top request")
|
||||
}
|
||||
}
|
||||
let _ = connection.flush();
|
||||
}
|
||||
|
||||
pub fn set_active_opacity(window: &ApplicationWindow) {
|
||||
pub fn set_active_opacity(window: &ApplicationWindow, inactive_opacity: f64) {
|
||||
let Some(surface) = window.surface() else {
|
||||
return;
|
||||
};
|
||||
@@ -90,7 +86,7 @@ pub fn set_active_opacity(window: &ApplicationWindow) {
|
||||
let value = if window.is_active() {
|
||||
ACTIVE_OPACITY
|
||||
} else {
|
||||
INACTIVE_OPACITY
|
||||
inactive_opacity
|
||||
};
|
||||
let scaled = (value * u32::MAX as f64).round() as u32;
|
||||
if let Err(error) = connection.change_property32(
|
||||
|
||||
Reference in New Issue
Block a user