Put remembered columns first and standardize resolution buttons
This commit is contained in:
parent
66f2d49096
commit
63e4aeb061
|
|
@ -842,7 +842,7 @@ impl App {
|
|||
}
|
||||
|
||||
fn resolution_controls(&mut self, ui: &mut egui::Ui) {
|
||||
ui.label("Remember the decisions for this sheet, then reuse them next time.");
|
||||
ui.label("Remember column choices first, then save the complete sheet resolution.");
|
||||
let ready = !self.dirty
|
||||
&& self
|
||||
.analysis
|
||||
|
|
@ -851,6 +851,74 @@ impl App {
|
|||
let memory = self.memory_path().ok();
|
||||
let path = memory.clone().filter(|p| p.exists());
|
||||
let size = egui::vec2(ui.available_width(), 48.0);
|
||||
ui.strong("Column layout");
|
||||
ui.small("Reuse roles, duration handling and title options on sheets with the same headers. Row corrections stay separate.");
|
||||
let column_ready = self
|
||||
.tables
|
||||
.iter()
|
||||
.find(|t| t.name == self.sheet)
|
||||
.is_some_and(|table| {
|
||||
serde_json::from_str::<Profile>(&self.profile)
|
||||
.ok()
|
||||
.and_then(|profile| resolution::column_profile(table, &profile).ok())
|
||||
.is_some()
|
||||
});
|
||||
let column_lookup = self.resolution_dir.as_ref().and_then(|directory| {
|
||||
self.tables
|
||||
.iter()
|
||||
.find(|t| t.name == self.sheet)
|
||||
.map(|table| resolution::find_columns(directory, table))
|
||||
});
|
||||
let columns_match = column_lookup
|
||||
.as_ref()
|
||||
.and_then(|result| result.as_ref().ok())
|
||||
.and_then(|found| found.as_ref());
|
||||
if let Some(Err(error)) = &column_lookup {
|
||||
ui.colored_label(Color32::YELLOW, error.to_string());
|
||||
}
|
||||
ui.vertical(|ui| {
|
||||
if ui
|
||||
.add_enabled(
|
||||
column_ready && self.resolution_dir.is_some(),
|
||||
egui::Button::new("Remember column layout").min_size(size),
|
||||
)
|
||||
.clicked()
|
||||
&& let Err(error) = self.remember_columns()
|
||||
{
|
||||
self.error = Some(error.to_string());
|
||||
}
|
||||
if ui
|
||||
.add_enabled(
|
||||
columns_match.is_some(),
|
||||
egui::Button::new("Reuse remembered columns").min_size(size),
|
||||
)
|
||||
.clicked()
|
||||
&& let Err(error) = self.reuse_columns()
|
||||
{
|
||||
self.error = Some(error.to_string());
|
||||
}
|
||||
if let Some((path, _)) = &columns_match
|
||||
&& ui
|
||||
.add(egui::Button::new("Forget column layout").min_size(size))
|
||||
.clicked()
|
||||
{
|
||||
match std::fs::remove_file(path) {
|
||||
Ok(()) => self.status = "Remembered column layout removed".into(),
|
||||
Err(error) => self.error = Some(error.to_string()),
|
||||
}
|
||||
}
|
||||
});
|
||||
ui.small(if columns_match.is_some() {
|
||||
"Matching column layout found. Reuse requires Apply & recheck."
|
||||
} else {
|
||||
"No matching column layout remembered yet."
|
||||
});
|
||||
if !column_ready {
|
||||
ui.small("Resolve column issues to remember this layout; schedule errors can be resolved later.");
|
||||
}
|
||||
ui.add_space(8.0);
|
||||
ui.strong("Sheet resolutions");
|
||||
ui.small("Save and reuse all decisions for this exact sheet.");
|
||||
if ui.add_enabled(ready && memory.is_some(), egui::Button::new("Save resolution").min_size(size))
|
||||
.on_hover_text("Save or update the remembered resolution for this exact sheet. Original documents remain unchanged.").clicked()
|
||||
&& let Err(e) = self.remember() {
|
||||
|
|
@ -879,73 +947,9 @@ impl App {
|
|||
});
|
||||
ui.add_space(8.0);
|
||||
ui.separator();
|
||||
ui.strong("Column layout");
|
||||
ui.small("Reuse roles, duration handling and title options on sheets with the same headers. Row corrections stay separate.");
|
||||
let column_ready = self
|
||||
.tables
|
||||
.iter()
|
||||
.find(|t| t.name == self.sheet)
|
||||
.is_some_and(|table| {
|
||||
serde_json::from_str::<Profile>(&self.profile)
|
||||
.ok()
|
||||
.and_then(|profile| resolution::column_profile(table, &profile).ok())
|
||||
.is_some()
|
||||
});
|
||||
let column_lookup = self.resolution_dir.as_ref().and_then(|directory| {
|
||||
self.tables
|
||||
.iter()
|
||||
.find(|t| t.name == self.sheet)
|
||||
.map(|table| resolution::find_columns(directory, table))
|
||||
});
|
||||
let columns_match = column_lookup
|
||||
.as_ref()
|
||||
.and_then(|result| result.as_ref().ok())
|
||||
.and_then(|found| found.as_ref());
|
||||
if let Some(Err(error)) = &column_lookup {
|
||||
ui.colored_label(Color32::YELLOW, error.to_string());
|
||||
}
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
if ui
|
||||
.add_enabled(
|
||||
column_ready && self.resolution_dir.is_some(),
|
||||
egui::Button::new("Remember column layout"),
|
||||
)
|
||||
.clicked()
|
||||
&& let Err(error) = self.remember_columns()
|
||||
{
|
||||
self.error = Some(error.to_string());
|
||||
}
|
||||
if ui
|
||||
.add_enabled(
|
||||
columns_match.is_some(),
|
||||
egui::Button::new("Reuse remembered columns"),
|
||||
)
|
||||
.clicked()
|
||||
&& let Err(error) = self.reuse_columns()
|
||||
{
|
||||
self.error = Some(error.to_string());
|
||||
}
|
||||
if let Some((path, _)) = &columns_match
|
||||
&& ui.button("Forget column layout").clicked()
|
||||
{
|
||||
match std::fs::remove_file(path) {
|
||||
Ok(()) => self.status = "Remembered column layout removed".into(),
|
||||
Err(error) => self.error = Some(error.to_string()),
|
||||
}
|
||||
}
|
||||
});
|
||||
ui.small(if columns_match.is_some() {
|
||||
"Matching column layout found. Reuse requires Apply & recheck."
|
||||
} else {
|
||||
"No matching column layout remembered yet."
|
||||
});
|
||||
if !column_ready {
|
||||
ui.small("Resolve column issues to remember this layout; schedule errors can be resolved later.");
|
||||
}
|
||||
ui.add_space(8.0);
|
||||
ui.collapsing("Advanced", |ui| {
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
if ui.button("Load resolution…").clicked()
|
||||
egui::CollapsingHeader::new("Advanced").show_unindented(ui, |ui| {
|
||||
ui.vertical(|ui| {
|
||||
if ui.add(egui::Button::new("Load resolution…").min_size(size)).clicked()
|
||||
&& let Some(path) = rfd::FileDialog::new()
|
||||
.add_filter("Resolution JSON", &["json"])
|
||||
.pick_file()
|
||||
|
|
@ -956,14 +960,14 @@ impl App {
|
|||
if ui
|
||||
.add_enabled(
|
||||
self.profile_path.is_some(),
|
||||
egui::Button::new("Save (overwrite resolution)"),
|
||||
egui::Button::new("Save (overwrite resolution)").min_size(size),
|
||||
)
|
||||
.clicked()
|
||||
&& let Err(e) = self.save_profile(self.profile_path.clone().unwrap(), true)
|
||||
{
|
||||
self.error = Some(e.to_string());
|
||||
}
|
||||
if ui.button("Save resolution as…").clicked()
|
||||
if ui.add(egui::Button::new("Save resolution as…").min_size(size)).clicked()
|
||||
&& let Some(path) = rfd::FileDialog::new()
|
||||
.add_filter("Resolution JSON", &["json"])
|
||||
.set_file_name("rundown.resolution.json")
|
||||
|
|
@ -976,7 +980,7 @@ impl App {
|
|||
&mut self.replace_profile,
|
||||
"Allow Save as to replace a resolution",
|
||||
);
|
||||
if ui.button("Reset decisions").clicked() {
|
||||
if ui.add(egui::Button::new("Reset decisions").min_size(size)).clicked() {
|
||||
self.profile = "{}".into();
|
||||
self.profile_path = None;
|
||||
self.decisions_changed();
|
||||
|
|
@ -986,7 +990,7 @@ impl App {
|
|||
ui.label(format!("Resolution: {}", path.display()));
|
||||
}
|
||||
if ui
|
||||
.add_enabled(path.is_some(), egui::Button::new("Forget"))
|
||||
.add_enabled(path.is_some(), egui::Button::new("Forget").min_size(size))
|
||||
.clicked()
|
||||
{
|
||||
match std::fs::remove_file(path.unwrap()) {
|
||||
|
|
|
|||
|
|
@ -1004,6 +1004,7 @@ impl App {
|
|||
egui::Window::new("Saved resolutions")
|
||||
.open(&mut open)
|
||||
.default_width(560.0)
|
||||
.default_height(680.0)
|
||||
.resizable(true)
|
||||
.vscroll(true)
|
||||
.scroll_bar_visibility(egui::scroll_area::ScrollBarVisibility::VisibleWhenNeeded)
|
||||
|
|
@ -3218,6 +3219,21 @@ mod tests {
|
|||
render(&mut app, &ctx, size, vec![]);
|
||||
let labels = render(&mut app, &ctx, size, vec![]);
|
||||
assert!(!labels.iter().any(|(s, _)| s == "Save resolution as…"));
|
||||
let column_y = labels
|
||||
.iter()
|
||||
.find(|(s, _)| s == "Remember column layout")
|
||||
.unwrap()
|
||||
.1
|
||||
.center()
|
||||
.y;
|
||||
let sheet_y = labels
|
||||
.iter()
|
||||
.find(|(s, _)| s == "Save resolution")
|
||||
.unwrap()
|
||||
.1
|
||||
.center()
|
||||
.y;
|
||||
assert!(column_y < sheet_y);
|
||||
let save = labels
|
||||
.iter()
|
||||
.find(|(s, _)| s == "Save resolution")
|
||||
|
|
@ -3251,6 +3267,16 @@ mod tests {
|
|||
.1
|
||||
.center();
|
||||
click_size(&mut app, &ctx, advanced, size);
|
||||
render(
|
||||
&mut app,
|
||||
&ctx,
|
||||
size,
|
||||
vec![egui::Event::MouseWheel {
|
||||
unit: egui::MouseWheelUnit::Point,
|
||||
delta: egui::vec2(0.0, -300.0),
|
||||
modifiers: Default::default(),
|
||||
}],
|
||||
);
|
||||
let labels = render(&mut app, &ctx, size, vec![]);
|
||||
assert!(labels.iter().any(|(s, _)| s == "Save resolution as…"));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -490,7 +490,9 @@ filename, not a copy of the workbook; they remain local to this machine.
|
|||
|
||||
### Remember column layouts
|
||||
|
||||
In **Save resolutions…**, **Remember column layout** saves the resolved column
|
||||
In **Save resolutions…**, column layout controls appear first, followed by sheet
|
||||
resolutions. Action buttons share the same full-width sizing, including Advanced
|
||||
actions. **Remember column layout** saves the resolved column
|
||||
roles, Notes/Metadata/Ignore choices, duration units/handling/split/margin settings,
|
||||
and secondary-title handling. It is available once columns are valid, even if
|
||||
there are schedule errors or pending row corrections.
|
||||
|
|
|
|||
Loading…
Reference in New Issue