diff --git a/Cargo.lock b/Cargo.lock index 2d7ba32..2d860d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2212,7 +2212,7 @@ dependencies = [ [[package]] name = "pdf-presenter" -version = "0.1.35" +version = "0.1.36" dependencies = [ "bytemuck", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 5fda3d8..044032d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = ["crates/pdf-presenter"] resolver = "3" [workspace.package] -version = "0.1.35" +version = "0.1.36" edition = "2024" license = "MIT" repository = "https://proxy.dandaedre.com/gitea/idle-org/pdf-presenter" diff --git a/crates/pdf-presenter/src/localization.rs b/crates/pdf-presenter/src/localization.rs index d52996e..b5534dc 100644 --- a/crates/pdf-presenter/src/localization.rs +++ b/crates/pdf-presenter/src/localization.rs @@ -120,6 +120,7 @@ pub fn tr<'a>(ctx: &egui::Context, text: &'a str) -> &'a str { "Ouvrez un PDF ou un dossier d’images pour parcourir les diapositives." } "Close" => "Fermer", + "Browser screen" => "Écran du navigateur", "Preview size" => "Taille des aperçus", "Change on click" => "Diffuser au clic", "Presenter screen" => "Écran du présentateur", diff --git a/crates/pdf-presenter/src/presenter_ui.rs b/crates/pdf-presenter/src/presenter_ui.rs index 5fcd618..42ffb77 100644 --- a/crates/pdf-presenter/src/presenter_ui.rs +++ b/crates/pdf-presenter/src/presenter_ui.rs @@ -902,47 +902,64 @@ pub fn browser(ui: &mut Ui, s: &mut Studio, native: &mut UiState) { "Open a PDF or picture folder to browse slides.", )); } - ui.horizontal_wrapped(|ui| { - ui.heading(tr(&locale, "All slides")); - button( - ui, - tr(&locale, "Close"), - Action::CloseBrowser, - &mut s.actions, - ); - ui.add( - egui::Slider::new(&mut s.settings.thumbnail_size, 100. ..=400.) - .text(tr(&locale, "Preview size")), - ); - ui.checkbox(&mut s.change_on_click, tr(&locale, "Change on click")); - egui::ComboBox::from_id_salt("browser-monitor") - .selected_text( - s.settings - .browser_monitor - .as_deref() - .unwrap_or(tr(&locale, "Presenter screen")), - ) - .show_ui(ui, |ui| { - ui.selectable_value( - &mut s.settings.browser_monitor, - None, - tr(&locale, "Presenter screen"), + egui::Frame::group(ui.style()) + .inner_margin(12.) + .show(ui, |ui| { + ui.set_width(ui.available_width()); + ui.spacing_mut().item_spacing = Vec2::new(16., 10.); + ui.spacing_mut().button_padding = Vec2::new(12., 7.); + ui.spacing_mut().interact_size.y = 30.; + ui.horizontal_wrapped(|ui| { + ui.heading(tr(&locale, "All slides")); + button( + ui, + tr(&locale, "Close"), + Action::CloseBrowser, + &mut s.actions, ); - for monitor in &s.monitors { - ui.selectable_value( - &mut s.settings.browser_monitor, - Some(monitor.id.clone()), - &monitor.name, - ); - } }); - button( - ui, - tr(&locale, "Show selected"), - Action::Go(s.browser_selected), - &mut s.actions, - ); - }); + ui.separator(); + ui.horizontal_wrapped(|ui| { + ui.add( + egui::Slider::new(&mut s.settings.thumbnail_size, 100. ..=400.) + .text(tr(&locale, "Preview size")), + ); + ui.horizontal(|ui| { + ui.label(tr(&locale, "Browser screen")); + egui::ComboBox::from_id_salt("browser-monitor") + .selected_text( + s.settings + .browser_monitor + .as_deref() + .unwrap_or(tr(&locale, "Presenter screen")), + ) + .show_ui(ui, |ui| { + ui.selectable_value( + &mut s.settings.browser_monitor, + None, + tr(&locale, "Presenter screen"), + ); + for monitor in &s.monitors { + ui.selectable_value( + &mut s.settings.browser_monitor, + Some(monitor.id.clone()), + &monitor.name, + ); + } + }); + }); + }); + ui.horizontal_wrapped(|ui| { + button( + ui, + tr(&locale, "Show selected"), + Action::Go(s.browser_selected), + &mut s.actions, + ); + ui.checkbox(&mut s.change_on_click, tr(&locale, "Change on click")); + }); + }); + ui.add_space(8.); ui.label(format!( "{} {} · {} {} · {}", if s.settings.language.french() { diff --git a/docs/changelog.md b/docs/changelog.md index 943d2c0..f4e07ce 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -2,6 +2,12 @@ ## Unreleased +### 0.1.36 + +- Give All slides a padded toolbar with separate title, preview/display settings, + and presentation-action rows. Enlarge control spacing and label the browser + screen selector; rows still wrap in narrower windows. + ### 0.1.35 - Hide the previous-slide preview by default; enable it in Layout. Preserve explicit