Added chain previous event functionality
This commit is contained in:
parent
dc10194971
commit
12366b1247
4 changed files with 51 additions and 3 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -9,3 +9,6 @@
|
||||||
|
|
||||||
# These are backup files generated by rustfmt
|
# These are backup files generated by rustfmt
|
||||||
**/*.rs.bk
|
**/*.rs.bk
|
||||||
|
|
||||||
|
# Logs may be created here if $XDG_CONFIG_HOME is not set
|
||||||
|
/logs/
|
||||||
|
|
|
||||||
23
src/main.rs
23
src/main.rs
|
|
@ -59,6 +59,7 @@ fn load_log(ui_weak: Weak<AppWindow>, log: Arc<Mutex<Log>>) {
|
||||||
let model: ModelRc<TimelineEvent> = Rc::new(VecModel::from(events)).into();
|
let model: ModelRc<TimelineEvent> = Rc::new(VecModel::from(events)).into();
|
||||||
ui.set_record_events(model);
|
ui.set_record_events(model);
|
||||||
ui.set_in_progress(in_progress);
|
ui.set_in_progress(in_progress);
|
||||||
|
ui.invoke_get_previous_event();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn load_colors(ui_weak: Weak<AppWindow>, config: Arc<Config>) {
|
fn load_colors(ui_weak: Weak<AppWindow>, config: Arc<Config>) {
|
||||||
|
|
@ -230,6 +231,25 @@ fn main() -> Result<(), Box<dyn Error>> {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ui.on_get_previous_event({
|
||||||
|
let ui_weak = ui.as_weak();
|
||||||
|
let log = writing_log.clone();
|
||||||
|
move || {
|
||||||
|
let ui = ui_weak.unwrap();
|
||||||
|
let prev_event_name = {
|
||||||
|
let log_guard = log.lock().expect("Log shouldn't be used twice");
|
||||||
|
let prev_index = log_guard.events.len() - 2;
|
||||||
|
log_guard.events
|
||||||
|
.get(prev_index)
|
||||||
|
.expect("Index is already checked")
|
||||||
|
.name
|
||||||
|
.clone()
|
||||||
|
};
|
||||||
|
println!("{}", prev_event_name.as_str());
|
||||||
|
ui.set_previous_event_name(prev_event_name.to_shared_string());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
ui.on_new_day_started({
|
ui.on_new_day_started({
|
||||||
let ui_weak = ui.as_weak();
|
let ui_weak = ui.as_weak();
|
||||||
let log = writing_log.clone();
|
let log = writing_log.clone();
|
||||||
|
|
@ -272,7 +292,10 @@ fn main() -> Result<(), Box<dyn Error>> {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ui.invoke_get_previous_event();
|
||||||
|
|
||||||
ui.run()?;
|
ui.run()?;
|
||||||
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ export component AppWindow inherits Window {
|
||||||
callback stop-event <=> record.stop-event;
|
callback stop-event <=> record.stop-event;
|
||||||
callback chain-event <=> record.chain-event;
|
callback chain-event <=> record.chain-event;
|
||||||
callback new-day-started <=> record.new-day-started;
|
callback new-day-started <=> record.new-day-started;
|
||||||
|
callback get-previous-event <=> record.get-previous-event;
|
||||||
callback update-record-offset(int);
|
callback update-record-offset(int);
|
||||||
callback save-log;
|
callback save-log;
|
||||||
|
|
||||||
|
|
@ -24,6 +25,7 @@ export component AppWindow inherits Window {
|
||||||
in-out property record-offset <=> record.offset;
|
in-out property record-offset <=> record.offset;
|
||||||
in-out property record-visible-time <=> record.visible-time;
|
in-out property record-visible-time <=> record.visible-time;
|
||||||
in-out property in-progress <=> record.in-progress;
|
in-out property in-progress <=> record.in-progress;
|
||||||
|
in property previous-event-name <=> record.previous-event-name;
|
||||||
|
|
||||||
in-out property review-events <=> review.events;
|
in-out property review-events <=> review.events;
|
||||||
in-out property review-offset <=> review.offset;
|
in-out property review-offset <=> review.offset;
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ export component RecordWidget inherits VerticalBox {
|
||||||
callback start-new-event(string);
|
callback start-new-event(string);
|
||||||
callback chain-event(string);
|
callback chain-event(string);
|
||||||
callback stop-event;
|
callback stop-event;
|
||||||
|
callback get-previous-event();
|
||||||
in-out property visible-time <=> tl.visible-time;
|
in-out property visible-time <=> tl.visible-time;
|
||||||
in-out property updating <=> tl.updating;
|
in-out property updating <=> tl.updating;
|
||||||
in-out property offset <=> tl.offset;
|
in-out property offset <=> tl.offset;
|
||||||
|
|
@ -14,6 +15,7 @@ export component RecordWidget inherits VerticalBox {
|
||||||
in property<[string]> combo-spans: [];
|
in property<[string]> combo-spans: [];
|
||||||
in-out property<bool> in-progress: false;
|
in-out property<bool> in-progress: false;
|
||||||
property<string> event-name: "";
|
property<string> event-name: "";
|
||||||
|
in property<string> previous-event-name: "";
|
||||||
property<bool> minimized: false;
|
property<bool> minimized: false;
|
||||||
property<int> combo-index: 0;
|
property<int> combo-index: 0;
|
||||||
tl := Timeline {
|
tl := Timeline {
|
||||||
|
|
@ -31,7 +33,7 @@ export component RecordWidget inherits VerticalBox {
|
||||||
text: event-name;
|
text: event-name;
|
||||||
font-size: 24px;
|
font-size: 24px;
|
||||||
horizontal-alignment: center;
|
horizontal-alignment: center;
|
||||||
colspan: 2;
|
colspan: 6;
|
||||||
row: 0;
|
row: 0;
|
||||||
edited(text) => {
|
edited(text) => {
|
||||||
event-name = text;
|
event-name = text;
|
||||||
|
|
@ -40,11 +42,13 @@ export component RecordWidget inherits VerticalBox {
|
||||||
Button {
|
Button {
|
||||||
text: in-progress ? "Stop" : "Start";
|
text: in-progress ? "Stop" : "Start";
|
||||||
row: 1;
|
row: 1;
|
||||||
|
colspan: 2;
|
||||||
clicked => {
|
clicked => {
|
||||||
if in-progress {
|
if in-progress {
|
||||||
root.stop-event();
|
root.stop-event();
|
||||||
} else {
|
} else {
|
||||||
root.start-new-event(event-name);
|
root.start-new-event(event-name);
|
||||||
|
root.get-previous-event();
|
||||||
}
|
}
|
||||||
in-progress = !in-progress;
|
in-progress = !in-progress;
|
||||||
}
|
}
|
||||||
|
|
@ -52,23 +56,39 @@ export component RecordWidget inherits VerticalBox {
|
||||||
Button {
|
Button {
|
||||||
text: "Chain";
|
text: "Chain";
|
||||||
enabled: in-progress;
|
enabled: in-progress;
|
||||||
col: 1;
|
col: 3;
|
||||||
row: 1;
|
row: 1;
|
||||||
|
colspan: 2;
|
||||||
clicked => {
|
clicked => {
|
||||||
root.chain-event(event-name);
|
root.chain-event(event-name);
|
||||||
|
root.get-previous-event();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Button {
|
||||||
|
text: previous-event-name == "" ? "Chain previous event (None)" : "Chain previous event (\{previous-event-name})";
|
||||||
|
enabled: in-progress && previous-event-name != "";
|
||||||
|
col: 5;
|
||||||
|
row: 1;
|
||||||
|
colspan: 2;
|
||||||
|
clicked => {
|
||||||
|
event-name = previous-event-name;
|
||||||
|
root.chain-event(event-name);
|
||||||
|
root.get-previous-event();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Text {
|
Text {
|
||||||
text: "Span:";
|
text: "Span:";
|
||||||
font-size: 24px;
|
font-size: 24px;
|
||||||
row: 2;
|
row: 2;
|
||||||
|
colspan: 3;
|
||||||
horizontal-alignment: right;
|
horizontal-alignment: right;
|
||||||
}
|
}
|
||||||
ComboBox {
|
ComboBox {
|
||||||
model: combo-spans;
|
model: combo-spans;
|
||||||
current-index: combo-index;
|
current-index: combo-index;
|
||||||
row: 2;
|
row: 2;
|
||||||
col: 1;
|
col: 3;
|
||||||
|
colspan: 3;
|
||||||
selected(current-value) => {
|
selected(current-value) => {
|
||||||
root.update-visible-time(current-value);
|
root.update-visible-time(current-value);
|
||||||
combo-index = self.current-index;
|
combo-index = self.current-index;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue