brasse/waydock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

Skärmbilder i README + --settings-flagga
All checks were successful
check / check (push) Successful in 1m44s
Details

Browse Source 
Nya assets/screenshots (tagna i nästlad headless-Wayfire): hero-bild,
dock-närbild och settings-fönstret. Ny CLI-flagga --settings öppnar
inställningsfönstret direkt vid start.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
claude
2026-08-30 01:55:04 +02:00
parent cfd1dbd4f4
commit b8674ce5f0
8 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main.rs
View File

@@ -28,14 +28,16 @@ struct Cli {
config: Option<PathBuf>,
log: Option<String>,
log_file: Option<String>,
open_settings: bool,
}
fn parse_cli() -> Cli {
let mut cli = Cli { config: None, log: None, log_file: None };
let mut cli = Cli { config: None, log: None, log_file: None, open_settings: false };
let mut args = std::env::args().skip(1);
while let Some(arg) = args.next() {
match arg.as_str() {
"--config" => cli.config = args.next().map(PathBuf::from),
"--settings" => cli.open_settings = true,
"--log" => cli.log = args.next(),
"--log-file" => cli.log_file = args.next(),
"--version" | "-V" => {
@@ -49,6 +51,7 @@ fn parse_cli() -> Cli {
--config <fil> annan configfil (default ~/.config/waydock/config.json)\n \
--log <nivå> error|warn|info|debug|trace (även env WAYDOCK_LOG)\n \
--log-file <fil> skriv logg till fil\n \
--settings öppna inställningsfönstret vid start\n \
--version visa version"
);
std::process::exit(0);
@@ -128,20 +131,21 @@ fn main() -> glib::ExitCode {
let started = Rc::new(Cell::new(false));
let cfg_path2 = cfg_path.clone();
let open_settings = cli.open_settings;
app.connect_activate(move |app| {
if started.get() {
info!("waydock kör redan — ignorerar andra instansen");
return;
}
started.set(true);
activate(app, cfg_path2.clone());
activate(app, cfg_path2.clone(), open_settings);
});
// ge inte GTK våra egna flaggor
app.run_with_args::<&str>(&[])
}
fn activate(app: &gtk::Application, cfg_path: PathBuf) {
fn activate(app: &gtk::Application, cfg_path: PathBuf, open_settings: bool) {
let cfg: config::SharedConfig = Rc::new(RefCell::new(config::load_or_create(&cfg_path)));
let ctx = Rc::new(dock::Ctx {
@@ -224,6 +228,10 @@ fn activate(app: &gtk::Application, cfg_path: PathBuf) {
);
}
if open_settings {
settings::open(&ctx);
}
// skärmar in/ut → bygg om (debouncat, skärmar kommer i klungor)
{
let ctx2 = ctx.clone();