mirror of
https://github.com/veeso/termscp.git
synced 2026-09-27 14:31:18 -07:00
build: migrate to tui-realm 4.0
Upgrade tuirealm (3.x -> 4.0.0), tui-realm-stdlib (3 -> 4), tui-term (0.2 -> 0.3). Apply all breaking changes from the 4.0 migration guide across the termscp UI. Key changes: - Root-level re-exports removed; imports moved to module-qualified paths (`tuirealm::application`, `::component`, `::event`, `::props`, `::state`, `::subscription`, `::listener`, `::ratatui`). Same for stdlib component types (`tui_realm_stdlib::components::*`). - `MockComponent` trait renamed to `Component`; old `Component` trait renamed to `AppComponent`. `#[derive(MockComponent)]` is now `#[derive(Component)]`. `Component::on` now takes `&Event<_>`. - `TextSpan` replaced with `SpanStatic`/`LineStatic`/`TextStatic` (ratatui-based); tuple `(String, Alignment)` titles replaced with the new `Title` builder; `Alignment` split into `HorizontalAlignment`/`VerticalAlignment`; stdlib components use `.alignment_horizontal` instead of `.alignment`. - `State::One`/`PropPayload::One` -> `Single`. `CmdResult::None` -> `NoChange`. `Props::get_or` removed; `Props::get` now returns a borrowed `Option<&AttrValue>` (call sites switched to `.and_then(AttrValue::as_*)`). `Component::query` returns `Option<QueryResult<'a>>`. - `Attribute::HighlightedColor` -> `HighlightStyle` (a full `Style`). `.highlighted_*` helpers renamed to `.highlight_*`. - `PollStrategy::UpTo(n)` now requires a `Duration`; tick timeout moved from `EventListenerCfg::poll_timeout` into `PollStrategy`. - `TerminalBridge` removed; `Context` now holds `CrosstermTerminalAdapter` directly and enables raw mode + alternate screen explicitly. The `TerminalAdapter` trait is imported where its methods are used. - `Update` trait removed; activity `update` methods are plain inherent functions. - `ProgressBar` replaced by stdlib `Gauge`. Paragraph `.wrap` renamed to `.wrap_trim`; `.text` now takes an `Into<Text>`. Stdlib `List` row items are now individual lines (`Vec<Span>` per row) rather than a `Table` of spans; custom `FileList`/`Log` convert between the two models. - Radio builders drop `.foreground(color)` so unselected items render with the terminal default foreground, and set `highlight_style(Style::default().fg(color).add_modifier(REVERSED))` so the selected entry is visibly highlighted only with the theme color. - Custom `FileList` keeps the selected row highlighted with the full highlight style when focused and falls back to a foreground-only style when unfocused. - Theme loading is now backwards compatible: `Theme` uses a custom `Deserialize` through an intermediate `ThemeFile` with optional fields, so missing keys, unknown values or legacy aliases (`transfer_progress_bar_full`/`_partial`) fall back to defaults on a per-field basis instead of failing the whole load.
This commit is contained in:
@@ -7,7 +7,8 @@
|
||||
use std::env;
|
||||
|
||||
use tuirealm::ratatui::style::Color;
|
||||
use tuirealm::{State, StateValue};
|
||||
use tuirealm::state::{State, StateValue};
|
||||
use tuirealm::terminal::TerminalAdapter;
|
||||
|
||||
use super::{Id, IdSsh, IdTheme, SetupActivity, ViewLayout};
|
||||
// Ext
|
||||
@@ -96,7 +97,7 @@ impl SetupActivity {
|
||||
// Get key
|
||||
// get index
|
||||
let idx: Option<usize> = match self.app.state(&Id::Ssh(IdSsh::SshKeys)) {
|
||||
Ok(State::One(StateValue::Usize(idx))) => Some(idx),
|
||||
Ok(State::Single(StateValue::Usize(idx))) => Some(idx),
|
||||
_ => None,
|
||||
};
|
||||
// get ssh key and delete it
|
||||
@@ -114,11 +115,11 @@ impl SetupActivity {
|
||||
pub(super) fn action_new_ssh_key(&mut self) -> Result<(), String> {
|
||||
// get parameters
|
||||
let host: String = match self.app.state(&Id::Ssh(IdSsh::SshHost)) {
|
||||
Ok(State::One(StateValue::String(host))) => host,
|
||||
Ok(State::Single(StateValue::String(host))) => host,
|
||||
_ => String::new(),
|
||||
};
|
||||
let username: String = match self.app.state(&Id::Ssh(IdSsh::SshUsername)) {
|
||||
Ok(State::One(StateValue::String(user))) => user,
|
||||
Ok(State::Single(StateValue::String(user))) => user,
|
||||
_ => String::new(),
|
||||
};
|
||||
// Prepare text editor
|
||||
@@ -382,7 +383,7 @@ impl SetupActivity {
|
||||
/// Get color from component
|
||||
fn get_color(&self, component: &Id) -> Result<Color, ()> {
|
||||
match self.app.state(component) {
|
||||
Ok(State::One(StateValue::String(color))) => {
|
||||
Ok(State::Single(StateValue::String(color))) => {
|
||||
match crate::utils::parser::parse_color(color.as_str()) {
|
||||
Some(c) => Ok(c),
|
||||
None => Err(()),
|
||||
|
||||
Reference in New Issue
Block a user