Rename Midra Preferences to Settings and clarify menu actions
This commit is contained in:
parent
ade0c0ab1b
commit
fa738f0ec4
|
|
@ -343,7 +343,7 @@ impl Editor {
|
|||
self.device.error.clear();
|
||||
self.device.message.clear();
|
||||
}
|
||||
ui.weak("Address saved automatically in application preferences. Connect reads device data; it does not change layers.");
|
||||
ui.weak("Address saved automatically in application settings. Connect reads device data; it does not change layers.");
|
||||
ui.horizontal(|ui| {
|
||||
if ui.add_enabled(self.device.pending.is_none(), egui::Button::new(if self.device.online() { "Refresh connection" } else { "Connect" })).clicked() { self.device.fetch(ctx); }
|
||||
if ui.add_enabled(self.device.online() && self.device.pending.is_none(), egui::Button::new("Disconnect")).clicked() {
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ impl Editor {
|
|||
}
|
||||
}
|
||||
pub(super) fn viewport_options_menu(&mut self, ui: &mut egui::Ui) {
|
||||
if ui.button("Preferences…").clicked() {
|
||||
if ui.button("Open all settings…").clicked() {
|
||||
self.preferences_open = true;
|
||||
ui.close_menu();
|
||||
}
|
||||
|
|
@ -192,7 +192,7 @@ impl Editor {
|
|||
}
|
||||
pub(super) fn application_menu(&mut self, ui: &mut egui::Ui) {
|
||||
ui.set_min_width(185.0);
|
||||
if ui.button("Preferences…").clicked() {
|
||||
if ui.button("Open all settings…").clicked() {
|
||||
self.preferences_open = true;
|
||||
ui.close_menu();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ impl Editor {
|
|||
}
|
||||
let before = self.application_settings(ctx);
|
||||
let mut open = self.preferences_open;
|
||||
egui::Window::new("Preferences")
|
||||
egui::Window::new("Settings")
|
||||
.open(&mut open)
|
||||
.default_width(660.0)
|
||||
.min_width(540.0)
|
||||
|
|
@ -84,7 +84,7 @@ impl Editor {
|
|||
}
|
||||
Section::Storage => {
|
||||
ui.heading("Files & settings");
|
||||
ui.label("Application preferences save automatically when changed.");
|
||||
ui.label("Application settings save automatically when changed.");
|
||||
if let Some(path) = &self.settings.path {
|
||||
ui.label(path.display().to_string());
|
||||
if ui.button("Copy settings path").clicked() { ctx.copy_text(path.display().to_string()); }
|
||||
|
|
@ -92,7 +92,7 @@ impl Editor {
|
|||
ui.separator();
|
||||
ui.label("Project JSON stores layout, sources, crops and the reference picture. SVG exports layer geometry.");
|
||||
ui.weak("Opening a project may restore its viewport options without rewriting your startup defaults.");
|
||||
if ui.button("Restore default preferences").clicked() {
|
||||
if ui.button("Restore default settings").clicked() {
|
||||
let defaults = settings::Settings::default();
|
||||
theme::Theme::restore_recent(ctx, defaults.recent_themes);
|
||||
defaults.theme.apply(ctx);
|
||||
|
|
@ -118,7 +118,7 @@ impl Editor {
|
|||
ui.separator();
|
||||
ui.label("Changes take effect immediately and save automatically.");
|
||||
if let Some(error) = &self.settings.error { ui.colored_label(ui.visuals().error_fg_color, error); }
|
||||
if self.settings.can_retry() && ui.button("Retry saving preferences").clicked() {
|
||||
if self.settings.can_retry() && ui.button("Retry saving settings").clicked() {
|
||||
self.settings.save(&self.application_settings(ctx));
|
||||
}
|
||||
if ui.button("Close").clicked() { self.preferences_open = false; }
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ the previous destination where atomic publication failed; Options offers a retry
|
|||
Failure to locate a configuration directory also disables persistence with an
|
||||
Options error. Tests use temporary directories and never touch user settings.
|
||||
|
||||
The device address is saved immediately when edited in **Midra connection…**. Startup attempts a read-only connection only when `autoconnect_at_startup` is enabled and the saved address is nonblank. It never sends layer settings. Opening a project preserves the current connection and address, clears import choices, and loads the project’s saved layer destination links. Connection status and snapshots are not persisted. Layer destination links are saved in project JSON, not application settings. Restore default preferences disables autoconnect and leaves the connection address unchanged; edit it in the connection window.
|
||||
The device address is saved immediately when edited in **Midra connection…**. Startup attempts a read-only connection only when `autoconnect_at_startup` is enabled and the saved address is nonblank. It never sends layer settings. Opening a project preserves the current connection and address, clears import choices, and loads the project’s saved layer destination links. Connection status and snapshots are not persisted. Layer destination links are saved in project JSON, not application settings. Restore default settings disables autoconnect and leaves the connection address unchanged; edit it in the connection window.
|
||||
|
||||
No layer geometry, source crops, camera state, project paths, image bytes or clipboard contents are stored. No settings are exported to SVG.
|
||||
Breaking or additive schema changes under this strict contract require a version
|
||||
|
|
@ -97,7 +97,7 @@ The picker includes both light and dark themes with color swatches.
|
|||
| Verdant Rebel | `verdant_rebel` | `theme-verdant-rebel.css` |
|
||||
| Weicat Industrial | `weicat_industrial` | `theme-weicat-industrial.css` |
|
||||
|
||||
The Preferences window and quick menus share the same settings. Changes apply
|
||||
The Settings window and quick menus share the same settings. Changes apply
|
||||
and save immediately; closing the window requires no Apply step. Restore default
|
||||
preferences resets appearance and editing values, including theme history and snapping, without
|
||||
changing layer geometry or pending position/size text fields. Snapping uses a
|
||||
|
|
@ -107,6 +107,6 @@ bypass it. Resize snapping preserves anchors and proportions and shows guides on
|
|||
when the resulting edge actually reaches its target.
|
||||
Shift temporarily overrides snapping with a 10-screen-pixel grid for layer movement and resizing; Ctrl+Shift uses 100 pixels. Alt bypasses both grids and ordinary snapping, including on release. These modifiers do not change the saved options or settings version.
|
||||
|
||||
**Preferences → Midra integration → Allow sending to Program** saves immediately. Restore default preferences disables it. Projects do not override this application preference; the Preview/Program destination itself remains session-only.
|
||||
**Settings → Midra integration → Allow sending to Program** saves immediately. Restore default settings disables it. Projects do not override this application preference; the Preview/Program destination itself remains session-only.
|
||||
|
||||
**Try autoconnecting at startup** is in Preferences → Midra integration. It saves immediately but applies on the next launch; toggling it does not initiate a connection. One background attempt uses the regular connection timeout and error handling, with no automatic retry loop. Failures leave the app offline and are reported in Midra connection. Project loading does not trigger an attempt.
|
||||
**Try autoconnecting at startup** is in Settings → Midra integration. It saves immediately but applies on the next launch; toggling it does not initiate a connection. One background attempt uses the regular connection timeout and error handling, with no automatic retry loop. Failures leave the app offline and are reported in Midra connection. Project loading does not trigger an attempt.
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ above come from the installed device and its own WebRCS bundle.
|
|||
|
||||
## Read-only import bridge
|
||||
|
||||
Open **Midra connection…** in the main menu or **Preferences → Midra integration**. Enter the device IP and click **Connect**. Then open the separate **Import → Midra layers…** window.
|
||||
Open **Midra connection…** in the main menu or **Settings → Midra integration**. Enter the device IP and click **Connect**. Then open the separate **Import → Midra layers…** window.
|
||||
Reads run in a worker thread; canceling discards late results. Choose a screen and
|
||||
choose a destination beside each device layer: **Do not import**, **New layer**,
|
||||
or an existing visible, unlocked editor layer. Click **Import layers** directly
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ The offline editor now includes source/input/layer formats and cropping, all eig
|
|||
layer and crop handles, multi-selection/group resizing/alignment, reference import,
|
||||
draw.io/native/SVG paste with review, JSON project save/load, SVG all/visible export,
|
||||
19 bundled themes, recent-theme history and persistent application preferences.
|
||||
A full Preferences window and optional movement snapping with guides/Alt bypass
|
||||
A full Settings window and optional movement snapping with guides/Alt bypass
|
||||
are implemented. Project save/load and theme preferences are no longer future work.
|
||||
|
||||
Remaining work, in priority order:
|
||||
|
|
|
|||
|
|
@ -514,10 +514,10 @@ right-click menu (including multiple selections). These controls share the
|
|||
Options setting and save changes automatically. They do not apply or discard
|
||||
pending size/position edits. Crop zoom remains proportional.
|
||||
|
||||
## Preferences window
|
||||
## Settings window
|
||||
|
||||
Open **Menu → Preferences…**, **Options → Preferences…**, the toolbar cog's
|
||||
**Preferences…** entry, or **Ctrl/Cmd+,**. The window groups the available controls:
|
||||
Open **Menu → Open all settings…**, **Options → Open all settings…**, the toolbar cog's
|
||||
**Open all settings…** entry, or **Ctrl/Cmd+,**. The window groups the available controls:
|
||||
|
||||
- **Appearance:** themes, recent choices, icon captions and source-coordinate preview.
|
||||
- **Editing:** aspect-ratio lock, movement snapping and a keyboard/mouse reference.
|
||||
|
|
@ -532,7 +532,7 @@ presented as implemented until their mapping and transport are available.
|
|||
|
||||
### Movement snapping
|
||||
|
||||
Enable **Preferences → Editing → Snap movement & resizing** and choose pixel,
|
||||
Enable **Settings → Editing → Snap movement & resizing** and choose pixel,
|
||||
screen-edge and/or other-visible-layer-edge targets. Nearby edges show a guide;
|
||||
the proximity radius stays six logical pixels at any zoom. A selection moves as
|
||||
a rigid group. Hidden layers are ignored; visible locked layers can be targets.
|
||||
|
|
@ -542,7 +542,7 @@ handles retain their existing behavior. One drag remains one undo step, with Esc
|
|||
|
||||
## Midra connection and sending
|
||||
|
||||
Open **Midra connection…** in the main menu (also in **Preferences → Midra integration**), enter the device IP, then **Connect**. The address saves automatically in the application config and survives project loads and restarts; startup connects automatically only if **Try autoconnecting at startup** is enabled in Preferences → Midra integration.
|
||||
Open **Midra connection…** in the main menu (also in **Settings → Midra integration**), enter the device IP, then **Connect**. The address saves automatically in the application config and survives project loads and restarts; startup connects automatically only if **Try autoconnecting at startup** is enabled in Settings → Midra integration.
|
||||
|
||||
Open **Import → Midra layers…** for the separate layer import window. **Refresh layers** reads a fresh snapshot; **Connection settings…** opens the connection window.
|
||||
Choose a destination beside each device layer: existing layer, new layer, or skip.
|
||||
|
|
@ -659,7 +659,7 @@ Layer rows use padlock and eye icon buttons for locking and visibility, with too
|
|||
|
||||
Hold **Shift** while moving or resizing layers to snap to a **10 px grid**;
|
||||
**Ctrl+Shift** uses a **100 px grid**. These temporary grids override ordinary
|
||||
pixel/edge snapping, even when snapping is disabled in Preferences. **Alt**
|
||||
pixel/edge snapping, even when snapping is disabled in Settings. **Alt**
|
||||
bypasses both. The modifier state on release determines the final position.
|
||||
Grid coordinates are screen pixels measured from the screen's top-left, independent
|
||||
of viewport zoom. Group movement snaps the selection's bounding top-left and keeps
|
||||
|
|
@ -670,7 +670,7 @@ panning are unaffected. Shift-click still toggles selection; Shift-drag on a lay
|
|||
moves it on the grid, and Shift-drag on empty canvas adds a selection box.
|
||||
This replaces the previous Shift-to-invert-resize-snapping shortcut.
|
||||
|
||||
Midra layer lists omit unassigned source slots (`NONE` or empty). Assigned inputs remain listed even if the layer is off. The exporter defaults to Preview and hides Program until **Preferences → Midra integration → Allow sending to Program** is checked. This preference is saved automatically; turning it off returns the exporter and quick Apply action to Preview.
|
||||
Midra layer lists omit unassigned source slots (`NONE` or empty). Assigned inputs remain listed even if the layer is off. The exporter defaults to Preview and hides Program until **Settings → Midra integration → Allow sending to Program** is checked. This preference is saved automatically; turning it off returns the exporter and quick Apply action to Preview.
|
||||
|
||||
Destination choices in **Configure Midra export…** now save immediately on the editor layer and support Undo. Save the project JSON to keep links across sessions. Links include screen and layer IDs and survive refreshes and selection changes. Choose the empty destination on the linked screen to unlink. **Send all linked layers** is available beside Apply, in Export and in the send window; it includes unselected, hidden and locked linked layers, grouped by screen. Apply changes… opens configuration for the chosen layers. Preview/Program and sizing still use the current export options.
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
|
||||
## Unreleased
|
||||
|
||||
- Rename Preferences to Settings; menu actions now read “Open all settings…”.
|
||||
|
||||
- Shift-drag moves/resizes on a 10 px grid; Ctrl+Shift uses 100 px, Alt bypasses. Replaces resize snap inversion; Shift-click and empty-canvas additive selection remain.
|
||||
|
||||
- Add a subtle “Double-click to edit” reminder in the layer-list header.
|
||||
|
|
|
|||
Loading…
Reference in New Issue