Skip to content

DesignCraft: An open-source page and layout design editor written by scratch in pure Rust

Merge remote-tracking branch 'origin/main' into color-picker-layout

moppeeer15ce24f4f469
diff --cc crates/ui-egui/src/dialogs.rs
index 443df730e,e93e64679..38c85fa61
--- a/crates/ui-egui/src/dialogs.rs
+++ b/crates/ui-egui/src/dialogs.rs
@@@ -2102,9 -2338,9 +2338,10 @@@ pub fn show(app: &mut DesignApp, ctx: &
"alert" => 440.0,
"closeDocument" | "updateLink" | "deletePages" | "newWorkspace" | "pagesPanelOptions" => 380.0,
"newDocument" => 960.0,
+ "hyphenation" => 560.0,
"numberingSection" => 560.0,
crate::effects_dialog::ID => 720.0,
+ "colorPicker" => 580.0,
_ => 640.0,
};
let width = preferred_width.min(available.x);
@@@ -2355,9 -2591,24 +2592,24 @@@
let current = d.fields.get("current").cloned().unwrap_or_default();
justification(&app.ui.language, ui, &mut d, "", &current);
}
+ "hyphenation" => {
+ let current = d.fields.get("current").cloned().unwrap_or_default();
+ let units = app.session.active().map_or(Unit::Picas, |st| st.doc.settings.horizontal_units);
+ let preview = crate::i18n::tr(&app.ui.language, "Preview").to_string();
+ ui.horizontal_top(|ui| {
+ ui.vertical(|ui| hyphenation(&app.ui.language, ui, &mut d, "", &current, units));
+ ui.add_space(24.0);
+ check(ui, &mut d, "preview", &preview);
+ });
+ hyphenation_preview(app, &mut d);
+ if let Some(st) = d.fields.get("status").and_then(Value::as_str) {
+ ui.add_space(6.0);
+ crate::rtl::label(ui, egui::RichText::new(st).color(ui.visuals().error_fg_color));
+ }
+ }
"insertXref" => insert_xref(app, ui, &mut d),
"findFont" => find_font(app, ui, &mut d),
- "colorPicker" => color_picker(ui, &mut d),
+ "colorPicker" => color_picker(app, ui, &mut d),
"swatchOptions" => options::swatch_options(app, ui, &mut d),
"colorGroupOptions" => options::color_group_options(app, ui, &mut d),
"layerSettings" => options::layer_options(app, ui, &mut d),
diff --cc crates/ui-egui/src/i18n.rs
index 6e9a0b40b,4c60df9b1..7fda46cd4
--- a/crates/ui-egui/src/i18n.rs
+++ b/crates/ui-egui/src/i18n.rs
@@@ -150,30 -229,8 +229,30 @@@ const TABLE: &[(&str, [&str; 5])] = &
("Jumbo", ["Riesig", "Géante", "Gigante", "最大", "巨大"]),
("Proportional", ["Proportional", "Proportionnel", "Proporcional", "比例", "按比例"]),
("Pages Fixed", ["Seiten fixiert", "Pages fixes", "Páginas fijas", "ページを固定", "页面固定"]),
- ("Parents Fixed", ["Übergeordnete fixiert", "Parents fixes", "Páginas principales fijas", "親ページを固定", "父页面固定"]),
- ("Parents", ["Übergeordnete Seiten", "Parents", "Páginas principales", "親ページ", "父页面"]),
+ ("Parents Fixed", ["Übergeordnete fixiert", "Gabarits fixes", "Páginas principales fijas", "親ページを固定", "父页面固定"]),
+ ("Parents", ["Übergeordnete Seiten", "Gabarits", "Páginas principales", "親ページ", "父页面"]),
+ (
+ "RGB Color Space View",
+ [
+ "RGB-Farbraumansicht",
+ "Affichage de l’espace colorimétrique RVB",
+ "Vista de espacio de color RGB",
+ "RGB カラースペース表示",
+ "RGB 色彩空间视图",
+ ],
+ ),
+ (
+ "Lab Color Space View",
+ [
+ "Lab-Farbraumansicht",
+ "Affichage de l’espace colorimétrique Lab",
+ "Vista de espacio de color Lab",
+ "Lab カラースペース表示",
+ "Lab 色彩空间视图",
+ ],
+ ),
+ ("Add CMYK Swatch", ["CMYK-Farbfeld hinzufügen", "Ajouter une nuance CMJN", "Añadir muestra CMYK", "CMYK スウォッチを追加", "添加 CMYK 色板"]),
+ ("Added swatch", ["Farbfeld hinzugefügt", "Nuance ajoutée", "Muestra añadida", "スウォッチを追加しました", "已添加色板"]),
(
"Bulleted & Numbered Lists",
[