Options: color book folder shown like the other locations

Options > Files lists the color book folder as a read-only row with Open folder, like Plot styles or Fonts. The Add folder / Remove buttons, their messages and the explanatory line (in all 22 locales) are gone; the folder list stays in the settings for a later location option. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_013rGmDUNr1hUf4zo1X3dak8
2026-10-14 20:09:26 +00:00
1 parent a9bbb41671
commit a9d8d4b531
@@ -1453,7 +1453,6 @@ common =
    .color-book-encrypted = كتاب الألوان هذا مشفر ولا يمكن قراءته
    .color-book-empty = لا يحتوي كتاب الألوان على ألوان
    .color-book-locations = مواقع كتب الألوان
-    .color-book-locations-hint = المجلدات التي يُبحث فيها عن كتب الألوان ‎.acb. يُنسخ الكتاب الذي يُحمَّل في اختيار اللون إلى المجلد الأول.
    .cad-color-index-aci-10-249 = فهرس ألوان ACI 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = الرسم متساوي القياس
@@ -1440,7 +1440,6 @@ common =
    .color-book-encrypted = Този цветови каталог е шифрован и не може да бъде прочетен
    .color-book-empty = Цветовият каталог няма цветове
    .color-book-locations = Местоположения на цветови каталози
-    .color-book-locations-hint = Папки, в които се търсят цветови каталози .acb. Каталог, зареден в „Избор на цвят“, се копира в първата папка.
    .cad-color-index-aci-10-249 = ACI Цветови индекс 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Изометрично чертане
@@ -1440,7 +1440,6 @@ common =
    .color-book-encrypted = Tento barevný vzorník je zašifrovaný a nelze jej přečíst
    .color-book-empty = Barevný vzorník neobsahuje žádné barvy
    .color-book-locations = Umístění barevných vzorníků
-    .color-book-locations-hint = Složky, ve kterých se hledají barevné vzorníky .acb. Vzorník načtený ve Výběru barvy se zkopíruje do první složky.
    .cad-color-index-aci-10-249 = Barevný index ACI 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Izometrické kreslení
@@ -1441,7 +1441,6 @@ common =
    .color-book-encrypted = Dieses Farbbuch ist verschlüsselt und kann nicht gelesen werden
    .color-book-empty = Das Farbbuch enthält keine Farben
    .color-book-locations = Speicherorte für Farbbücher
-    .color-book-locations-hint = Ordner, in denen nach .acb-Farbbüchern gesucht wird. Ein in „Farbe wählen“ geladenes Farbbuch wird in den ersten Ordner kopiert.
    .cad-color-index-aci-10-249 = ACI Farbindex 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Isometrisches Zeichnen
@@ -1442,7 +1442,6 @@ common =
    .color-book-encrypted = Αυτό το βιβλίο χρωμάτων είναι κρυπτογραφημένο και δεν μπορεί να διαβαστεί
    .color-book-empty = Το βιβλίο χρωμάτων δεν έχει χρώματα
    .color-book-locations = Θέσεις βιβλίων χρωμάτων
-    .color-book-locations-hint = Φάκελοι στους οποίους αναζητούνται βιβλία χρωμάτων .acb. Ένα βιβλίο που φορτώνεται στην Επιλογή χρώματος αντιγράφεται στον πρώτο φάκελο.
    .cad-color-index-aci-10-249 = Δείκτης χρώματος ACI 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Ισομετρική σχεδίαση
@@ -1441,7 +1441,6 @@ common =
    .color-book-encrypted = This color book is encrypted and cannot be read
    .color-book-empty = The color book has no colors
    .color-book-locations = Color book locations
-    .color-book-locations-hint = Folders searched for .acb color books. A book loaded in Select Color is copied into the first folder.
    .cad-color-index-aci-10-249 = CAD Color Index (ACI) 10–249
    .grayscale-250-255 = Grayscale 250–255
    .isometric-drafting = Isometric drafting
@@ -1441,7 +1441,6 @@ common =
    .color-book-encrypted = Este libro de colores está cifrado y no se puede leer
    .color-book-empty = El libro de colores no tiene colores
    .color-book-locations = Ubicaciones de libros de colores
-    .color-book-locations-hint = Carpetas en las que se buscan libros de colores .acb. Un libro cargado en Seleccionar color se copia en la primera carpeta.
    .cad-color-index-aci-10-249 = Índice de color ACI 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Dibujo isométrico
@@ -1440,7 +1440,6 @@ common =
    .color-book-encrypted = Tämä värikirja on salattu eikä sitä voi lukea
    .color-book-empty = Värikirjassa ei ole värejä
    .color-book-locations = Värikirjojen sijainnit
-    .color-book-locations-hint = Kansiot, joista etsitään .acb-värikirjoja. Värin valinnassa ladattu värikirja kopioidaan ensimmäiseen kansioon.
    .cad-color-index-aci-10-249 = ACI väriindeksi 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Isometrinen piirtäminen
@@ -1441,7 +1441,6 @@ common =
    .color-book-encrypted = Ce carnet de couleurs est chiffré et ne peut pas être lu
    .color-book-empty = Le carnet de couleurs ne contient aucune couleur
    .color-book-locations = Emplacements des carnets de couleurs
-    .color-book-locations-hint = Dossiers où rechercher les carnets de couleurs .acb. Un carnet chargé dans Sélectionner une couleur est copié dans le premier dossier.
    .cad-color-index-aci-10-249 = ACI Indice de couleur 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Dessin isométrique
@@ -1429,7 +1429,6 @@ common =
    .color-book-encrypted = यह रंग पुस्तक एन्क्रिप्टेड है और पढ़ी नहीं जा सकती
    .color-book-empty = रंग पुस्तक में कोई रंग नहीं है
    .color-book-locations = रंग पुस्तकों के स्थान
-    .color-book-locations-hint = वे फ़ोल्डर जिनमें .acb रंग पुस्तकें खोजी जाती हैं। रंग चुनें में लोड की गई पुस्तक पहले फ़ोल्डर में कॉपी की जाती है।
    .cad-color-index-aci-10-249 = ACI रंग सूचकांक 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = सममितीय आरेखन
@@ -1445,7 +1445,6 @@ common =
    .color-book-encrypted = Ez a színkönyv titkosított, és nem olvasható
    .color-book-empty = A színkönyv nem tartalmaz színeket
    .color-book-locations = Színkönyvek helye
-    .color-book-locations-hint = Mappák, amelyekben a program .acb színkönyveket keres. A Szín kiválasztása ablakban betöltött színkönyv az első mappába másolódik.
    .cad-color-index-aci-10-249 = ACI színindex 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Izometrikus rajzolás
@@ -1440,7 +1440,6 @@ common =
    .color-book-encrypted = Questo album colori è crittografato e non può essere letto
    .color-book-empty = L'album colori non contiene colori
    .color-book-locations = Percorsi degli album colori
-    .color-book-locations-hint = Cartelle in cui cercare gli album colori .acb. Un album caricato in Seleziona colore viene copiato nella prima cartella.
    .cad-color-index-aci-10-249 = ACI Indice colori 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Disegno isometrico
@@ -1431,7 +1431,6 @@ common =
    .color-book-encrypted = このカラー ブックは暗号化されているため読み込めません
    .color-book-empty = カラー ブックに色がありません
    .color-book-locations = カラー ブックの場所
-    .color-book-locations-hint = .acb カラー ブックを検索するフォルダです。[色を選択] で読み込んだブックは最初のフォルダにコピーされます。
    .cad-color-index-aci-10-249 = ACI カラーインデックス 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = アイソメ図作成
@@ -1440,7 +1440,6 @@ common =
    .color-book-encrypted = 이 색상표는 암호화되어 있어 읽을 수 없습니다
    .color-book-empty = 색상표에 색상이 없습니다
    .color-book-locations = 색상표 위치
-    .color-book-locations-hint = .acb 색상표를 찾는 폴더입니다. 색상 선택에서 로드한 색상표는 첫 번째 폴더에 복사됩니다.
    .cad-color-index-aci-10-249 = ACI 컬러 인덱스 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = 등각 제도
@@ -1446,7 +1446,6 @@ common =
    .color-book-encrypted = ປຶ້ມສີນີ້ຖືກເຂົ້າລະຫັດ ແລະອ່ານບໍ່ໄດ້
    .color-book-empty = ປຶ້ມສີບໍ່ມີສີ
    .color-book-locations = ທີ່ຕັ້ງປຶ້ມສີ
-    .color-book-locations-hint = ໂຟນເດີທີ່ໃຊ້ຊອກຫາປຶ້ມສີ .acb. ປຶ້ມທີ່ໂຫຼດໃນເລືອກສີຈະຖືກສຳເນົາໄປໃສ່ໂຟນເດີທຳອິດ.
    .cad-color-index-aci-10-249 = CAD Color Index (ACI) 10–249
    .grayscale-250-255 = ລະດັບສີເທົາ 250–255
    .isometric-drafting = ການຂຽນແບບໄອໂຊເມຕຣິກ
@@ -1439,7 +1439,6 @@ common =
    .color-book-encrypted = Dit kleurboek is versleuteld en kan niet worden gelezen
    .color-book-empty = Het kleurboek bevat geen kleuren
    .color-book-locations = Locaties van kleurboeken
-    .color-book-locations-hint = Mappen waarin naar .acb-kleurboeken wordt gezocht. Een kleurboek dat in Kleur selecteren wordt geladen, wordt naar de eerste map gekopieerd.
    .cad-color-index-aci-10-249 = ACI Kleurindex 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Isometrisch tekenen
@@ -1440,7 +1440,6 @@ common =
    .color-book-encrypted = Ten wzornik kolorów jest zaszyfrowany i nie można go odczytać
    .color-book-empty = Wzornik kolorów nie zawiera kolorów
    .color-book-locations = Lokalizacje wzorników kolorów
-    .color-book-locations-hint = Foldery przeszukiwane w poszukiwaniu wzorników kolorów .acb. Wzornik wczytany w oknie Wybierz kolor jest kopiowany do pierwszego folderu.
    .cad-color-index-aci-10-249 = Indeks kolorów ACI 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Rysowanie izometryczne
@@ -1441,7 +1441,6 @@ common =
    .color-book-encrypted = Este catálogo de cores é criptografado e não pode ser lido
    .color-book-empty = O catálogo de cores não tem cores
    .color-book-locations = Locais dos catálogos de cores
-    .color-book-locations-hint = Pastas pesquisadas em busca de catálogos de cores .acb. Um catálogo carregado em Selecionar cor é copiado para a primeira pasta.
    .cad-color-index-aci-10-249 = Índice de cor ACI 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Desenho isométrico
@@ -1444,7 +1444,6 @@ common =
    .color-book-encrypted = Этот альбом цветов зашифрован и не может быть прочитан
    .color-book-empty = В альбоме цветов нет цветов
    .color-book-locations = Расположение альбомов цветов
-    .color-book-locations-hint = Папки, в которых ищутся альбомы цветов .acb. Альбом, загруженный в окне «Выбор цвета», копируется в первую папку.
    .cad-color-index-aci-10-249 = Индекс цвета ACI 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = Изометрическое черчение
@@ -1427,7 +1427,6 @@ common =
    .color-book-encrypted = Bu renk kitabı şifreli ve okunamıyor
    .color-book-empty = Renk kitabında renk yok
    .color-book-locations = Renk kitabı konumları
-    .color-book-locations-hint = Bu klasörlerde .acb renk kitapları aranır. Renk Seç'te yüklenen bir kitap ilk klasöre kopyalanır.
    .cad-color-index-aci-10-249 = ACI renk dizini 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = İzometrik çizim
@@ -1428,7 +1428,6 @@ common =
    .color-book-encrypted = 此配色系统已加密，无法读取
    .color-book-empty = 配色系统中没有颜色
    .color-book-locations = 配色系统位置
-    .color-book-locations-hint = 搜索 .acb 配色系统的文件夹。在“选择颜色”中加载的配色系统会复制到第一个文件夹。
    .cad-color-index-aci-10-249 = ACI 颜色索引 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = 等轴测绘图
@@ -1440,7 +1440,6 @@ common =
    .color-book-encrypted = 此配色系統已加密，無法讀取
    .color-book-empty = 配色系統中沒有顏色
    .color-book-locations = 配色系統位置
-    .color-book-locations-hint = 搜尋 .acb 配色系統的資料夾。在「選取顏色」中載入的配色系統會複製到第一個資料夾。
    .cad-color-index-aci-10-249 = ACI 顏色索引 10–249
    .grayscale-250-255 = { common.grayscale } 250–255
    .isometric-drafting = 等角製圖
@@ -4341,10 +4341,6 @@ pub enum Message {
    /// An `.acb` file was read (and, on desktop, copied into the first
    /// colour book folder).
    ColorBookLoaded(Result<crate::ui::color_select::book::ColorBook, String>),
-    /// Options › Files: pick a folder to search for colour books.
-    ColorBookDirBrowse,
-    ColorBookDirAdd(String),
-    ColorBookDirRemove(usize),
    /// Set a block/linetype Handle field on the selected dim style from a
    /// dropdown of available block-records / linetypes (by name).
    DsSetHandle {
@@ -11993,35 +11993,6 @@ impl OpenCADStudio {
                }
                Task::none()
            }
-            #[cfg(not(target_arch = "wasm32"))]
-            Message::ColorBookDirBrowse => Task::perform(
-                async {
-                    crate::sys::file_dialog()
-                        .pick_folder()
-                        .await
-                        .map(|handle| crate::sys::handle_path(&handle).display().to_string())
-                },
-                |dir| dir.map_or(Message::Noop, Message::ColorBookDirAdd),
-            ),
-            // Browsers expose no folder picker.
-            #[cfg(target_arch = "wasm32")]
-            Message::ColorBookDirBrowse => Task::none(),
-            Message::ColorBookDirAdd(dir) => {
-                if !self.color_book_dirs.contains(&dir) {
-                    self.color_book_dirs.push(dir);
-                    self.color_books_read = false;
-                    self.persist_settings_if_changed();
-                }
-                Task::none()
-            }
-            Message::ColorBookDirRemove(i) => {
-                if i < self.color_book_dirs.len() {
-                    self.color_book_dirs.remove(i);
-                    self.color_books_read = false;
-                    self.persist_settings_if_changed();
-                }
-                Task::none()
-            }
            Message::DsSetHandle { field, value } => self.on_ds_set_handle(field, value),
        }
    }
@@ -4945,7 +4945,6 @@ pub(super) fn message_attribute(source: &str) -> Option<(&'static str, &'static
        "This color book is encrypted and cannot be read" => Some(("common", "color-book-encrypted")),
        "The color book has no colors" => Some(("common", "color-book-empty")),
        "Color book locations" => Some(("common", "color-book-locations")),
-        "Folders searched for .acb color books. A book loaded in Select Color is copied into the first folder." => Some(("common", "color-book-locations-hint")),
        "CAD Color Index (ACI) 10–249" => Some(("common", "cad-color-index-aci-10-249")),
        "Grayscale 250–255" => Some(("common", "grayscale-250-255")),
        "Isometric drafting" => Some(("common", "isometric-drafting")),
@@ -1773,49 +1773,6 @@ pub fn view_window<'a>(
        .align_y(iced::Center)
    };

-    // Searched for `.acb` colour books; editable, unlike the folders above.
-    // Browsers have no folders, so the web build leaves it out.
-    let color_book_locations = |dirs: &'a [String]| -> Element<'a, Message> {
-        if cfg!(target_arch = "wasm32") {
-            return Space::new().into();
-        }
-        let list = dirs
-            .iter()
-            .enumerate()
-            .fold(column![].spacing(6), |list, (i, dir)| {
-                list.push(
-                    row![
-                        text(dir.as_str()).size(11).width(Fill),
-                        button(text(crate::t!("Open folder")).size(11))
-                            .padding([4, 10])
-                            .style(button::secondary)
-                            .on_press(Message::OpenFolder(dir.clone())),
-                        button(text(crate::t!("Remove")).size(11))
-                            .padding([4, 10])
-                            .style(button::secondary)
-                            .on_press(Message::ColorBookDirRemove(i)),
-                    ]
-                    .spacing(10)
-                    .align_y(iced::Center),
-                )
-            });
-        column![
-            text(crate::t!("Color book locations")).size(12),
-            text(crate::t!(
-                "Folders searched for .acb color books. A book loaded in Select Color is copied into the first folder."
-            ))
-            .size(11),
-            list,
-            button(text(crate::t!("Add folder…")).size(11))
-                .padding([4, 10])
-                .style(button::secondary)
-                .on_press(Message::ColorBookDirBrowse),
-            Space::new().height(16),
-        ]
-        .spacing(6)
-        .into()
-    };
-
    let files = column![
        text(crate::t!("Files")).size(15),
        Space::new().height(6),
@@ -1834,8 +1791,14 @@ pub fn view_window<'a>(
        folder_row(crate::t!("Autosave files"), folders.autosave.clone()),
        Space::new().height(12),
        folder_row(crate::t!("Fonts"), folders.fonts.clone()),
+        // Where `.acb` colour books are found (none on the web).
+        color_book_dirs.iter().fold(column![], |rows, dir| rows
+            .push(Space::new().height(12))
+            .push(folder_row(
+                crate::t!("Color book locations"),
+                Some(dir.clone())
+            ))),
        Space::new().height(16),
-        color_book_locations(color_book_dirs),
        text(crate::t!("Default template for new drawings")).size(12),
        Space::new().height(4),
        row![