Track API changes. - icy_draw - icy_draw is the successor to mystic draw. fork / mirror
 (HTM) git clone https://git.drkhsh.at/icy_draw.git
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit a728661e1d7575caa9558b866d244827e53ecb8a
 (DIR) parent 1039d2dc79288dd39454834c80fba6fd4ba1bb05
 (HTM) Author: Mike Krüger <mkrueger@posteo.de>
       Date:   Wed, 11 Oct 2023 22:09:59 +0200
       
       Track API changes.
       
       Diffstat:
         M src/plugins/mod.rs                  |      20 +++++++++++---------
         M src/ui/editor/animation/mod.rs      |       4 ++--
       
       2 files changed, 13 insertions(+), 11 deletions(-)
       ---
 (DIR) diff --git a/src/plugins/mod.rs b/src/plugins/mod.rs
       @@ -1,7 +1,7 @@
        use std::{fs, path::Path, sync::Arc};
        
        use i18n_embed_fl::fl;
       -use icy_engine::{AttributedChar, BufferParser, Position, TextPane};
       +use icy_engine::{AttributedChar, Position, TextPane, UnicodeConverter};
        use mlua::{Lua, UserData};
        use regex::Regex;
        use walkdir::WalkDir;
       @@ -119,15 +119,17 @@ impl LuaBufferView {
                let buffer_type = self.buffer_view.lock().get_buffer().buffer_type;
                let ch = match buffer_type {
                    icy_engine::BufferType::Unicode => ch,
       -            icy_engine::BufferType::CP437 => icy_engine::ascii::Parser::default().convert_from_unicode(ch, self.buffer_view.lock().get_caret().get_font_page()),
       +            icy_engine::BufferType::CP437 => {
       +                icy_engine::ascii::CP437Converter::default().convert_from_unicode(ch, self.buffer_view.lock().get_caret().get_font_page())
       +            }
                    icy_engine::BufferType::Petscii => {
       -                icy_engine::petscii::Parser::default().convert_from_unicode(ch, self.buffer_view.lock().get_caret().get_font_page())
       +                icy_engine::petscii::CharConverter::default().convert_from_unicode(ch, self.buffer_view.lock().get_caret().get_font_page())
                    }
                    icy_engine::BufferType::Atascii => {
       -                icy_engine::atascii::Parser::default().convert_from_unicode(ch, self.buffer_view.lock().get_caret().get_font_page())
       +                icy_engine::atascii::CharConverter::default().convert_from_unicode(ch, self.buffer_view.lock().get_caret().get_font_page())
                    }
                    icy_engine::BufferType::Viewdata => {
       -                icy_engine::viewdata::Parser::default().convert_from_unicode(ch, self.buffer_view.lock().get_caret().get_font_page())
       +                icy_engine::viewdata::CharConverter::default().convert_from_unicode(ch, self.buffer_view.lock().get_caret().get_font_page())
                    }
                };
                Ok(ch)
       @@ -137,10 +139,10 @@ impl LuaBufferView {
                let buffer_type = self.buffer_view.lock().get_buffer().buffer_type;
                let ch = match buffer_type {
                    icy_engine::BufferType::Unicode => ch.ch,
       -            icy_engine::BufferType::CP437 => icy_engine::ascii::Parser::default().convert_to_unicode(ch),
       -            icy_engine::BufferType::Petscii => icy_engine::petscii::Parser::default().convert_to_unicode(ch),
       -            icy_engine::BufferType::Atascii => icy_engine::atascii::Parser::default().convert_to_unicode(ch),
       -            icy_engine::BufferType::Viewdata => icy_engine::viewdata::Parser::default().convert_to_unicode(ch),
       +            icy_engine::BufferType::CP437 => icy_engine::ascii::CP437Converter::default().convert_to_unicode(ch),
       +            icy_engine::BufferType::Petscii => icy_engine::petscii::CharConverter::default().convert_to_unicode(ch),
       +            icy_engine::BufferType::Atascii => icy_engine::atascii::CharConverter::default().convert_to_unicode(ch),
       +            icy_engine::BufferType::Viewdata => icy_engine::viewdata::CharConverter::default().convert_to_unicode(ch),
                };
                ch.to_string()
            }
 (DIR) diff --git a/src/ui/editor/animation/mod.rs b/src/ui/editor/animation/mod.rs
       @@ -12,7 +12,7 @@ use eframe::{
        use egui::{Image, ProgressBar};
        use egui_code_editor::{CodeEditor, Syntax};
        use i18n_embed_fl::fl;
       -use icy_engine::{ascii, AttributedChar, Buffer, BufferParser, EngineResult, Size, TextAttribute};
       +use icy_engine::{ascii, AttributedChar, Buffer, EngineResult, Size, TextAttribute, UnicodeConverter};
        use icy_engine_egui::{animations::Animator, show_terminal_area, BufferView, MonitorSettings};
        
        use self::encoding::{start_encoding_thread, ENCODERS};
       @@ -155,7 +155,7 @@ impl Document for AnimationEditor {
            }
        
            fn paste_char(&mut self, _ui: &mut eframe::egui::Ui, ch: char) {
       -        let ch = ascii::Parser::default().convert_to_unicode(AttributedChar::new(ch, TextAttribute::default()));
       +        let ch = ascii::CP437Converter::default().convert_to_unicode(AttributedChar::new(ch, TextAttribute::default()));
                self.txt.insert(self.cursor_index, ch);
                if let Some((i, _)) = self.txt.char_indices().nth(self.cursor_index + 1) {
                    self.cursor_index = i;