Merge pull request #171 from FrancescoCaracciolo/master

Author: qwersyk

po/zh_TW.po

@@ -13,7 +13,7 @@ msgstr ""
 "Language-Team: l10n-tw\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 

src/controller.py

@@ -110,6 +110,7 @@ def init_paths(self) -> None:
         self.models_dir = os.path.join(self.config_dir, "models")
         self.extension_path = os.path.join(self.config_dir, "extensions")
         self.extensions_cache = os.path.join(self.cache_dir, "extensions_cache")
+        self.newelle_dir = os.path.join(self.config_dir, DIR_NAME)
         print(self.pip_path, self.models_dir)
 
 
@@ -139,6 +140,8 @@ def check_path_integrity(self):
             os.makedirs(self.extensions_cache)
         if not os.path.exists(self.models_dir):
             os.makedirs(self.models_dir)
+        if not os.path.exists(self.newelle_dir):
+            os.makedirs(self.newelle_dir, exist_ok=True)
         # Fix Pip environment
         if os.path.isdir(self.pip_path):
             self.python_path.append(self.pip_path)
@@ -393,6 +396,10 @@ def fix_handlers_integrity(self, newelle_settings: NewelleSettings):
             newelle_settings.memory_model = list(AVAILABLE_MEMORIES.keys())[0]
         if newelle_settings.rag_model not in AVAILABLE_RAGS:
             newelle_settings.rag_model = list(AVAILABLE_RAGS.keys())[0]
+        if newelle_settings.tts_program not in AVAILABLE_TTS:
+            newelle_settings.tts_program = list(AVAILABLE_TTS.keys())[0]
+        if newelle_settings.stt_engine not in AVAILABLE_STT:
+            newelle_settings.stt_engine = list(AVAILABLE_STT.keys())[0]
 
     def select_handlers(self, newelle_settings: NewelleSettings):
         """Assign the selected handlers

src/ui/widgets/latex.py

@@ -1,51 +1,65 @@
 from gi.repository import Gtk, Gio, GLib, Gdk
 import matplotlib.pyplot as plt
-import uuid
-import os 
+import os
+from matplotlib.figure import Figure
+from matplotlib.backends.backend_gtk4agg import FigureCanvasGTK4Agg
+
+
+from matplotlib.figure import Figure
+
+
+class LatexCanvas(FigureCanvasGTK4Agg):
+    def __init__(self, latex: str, size: int, color):
+        fig = Figure()
+        fig.patch.set_alpha(0)
+        ax = fig.add_subplot()
+        txt = ax.text(0.5, 0.5, r'$' + latex + r'$', fontsize=size, ha='center', va='center', color=(color.red, color.blue, color.green))  
+        ax.axis('off')
+        fig.tight_layout(pad=0)
+        fig.canvas.draw()
+        fig_size = txt.get_window_extent()
+        h = int(fig_size.height)
+        w = int(fig_size.width)
+        super().__init__(fig)
+        self.set_hexpand(True)
+        self.set_vexpand(True)
+        self.set_size_request(w, h + int(h * (0.1)))
+        self.set_css_classes(['latex_renderer'])
 
 class DisplayLatex(Gtk.Box): 
+
     def __init__(self, latex:str, size:int, cache_dir: str) -> None:
         super().__init__()
         self.cachedir = cache_dir
-        self.size = size
+        self.size = size 
+
         overlay = Gtk.Overlay() 
-        color = self.get_style_context().lookup_color("window_fg_color")[1]
-        id = latex + str(size) + str(color.red) + str(color.green) + str(color.blue)
 
         self.latex = latex 
-        # Create equation image
-        fig = plt.figure()
-        fig.patch.set_alpha(0)
-        plt.text(0.5, 0.5, r'$' + latex + r'$', fontsize=size, ha='center', va='center', color=(color.red, color.blue, color.green))  
-        plt.axis('off')
-        # Get file name and save it in the cache
-        fname = os.path.join(self.cachedir, "latex" + '-symbolic.svg')
-
-        plt.tight_layout(pad=0)
-        plt.savefig(fname, transparent=True, bbox_inches='tight', pad_inches=0)
+        self.color = self.get_style_context().lookup_color("window_fg_color")[1]
         # Create Gtk.Picture
-        self.picture = Gtk.Picture()
-        self.picture.set_file(Gio.File.new_for_path(fname)) 
-        self.picture.set_size_request(-1, size)
-        self.picture.set_content_fit(Gtk.ContentFit.CONTAIN)
-        plt.close()
-
+        self.scroll = Gtk.ScrolledWindow(vscrollbar_policy=Gtk.PolicyType.NEVER, propagate_natural_height=True, hscrollbar_policy=Gtk.PolicyType.AUTOMATIC, propagate_natural_width=True)
+        self.picture = LatexCanvas(latex, self.size, self.color)
+        self.scroll.set_child(self.picture)
         self.create_control_box()
         self.controller()
-        overlay.set_child(self.picture)
+        overlay.set_child(self.scroll)
         overlay.add_overlay(self.control_box)
+        self.overlay = overlay
         self.append(overlay)
 
 
     def zoom_in(self, *_):
         self.size += 10
-        self.picture.set_size_request(-1, self.size)
+        self.picture = LatexCanvas(self.latex, self.size, self.color)
+        self.scroll.set_child(self.picture) 
 
     def zoom_out(self, *_):
-        if self.size < 20:
+        if self.size < 10:
             return
         self.size -= 10
-        self.picture.set_size_request(-1, self.size)
+        self.picture = LatexCanvas(self.latex, self.size, self.color)
+        self.scroll.set_child(self.picture)
 
     def create_control_box(self):
         self.control_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, halign=Gtk.Align.END, css_classes=["flat"], visible=False)

src/window.py

@@ -94,7 +94,7 @@ def __init__(self, *args, **kwargs):
         self.chat_block = Gtk.Box(
             orientation=Gtk.Orientation.VERTICAL, hexpand=True, css_classes=["view"]
         )
-        self.chat_header = Adw.HeaderBar(css_classes=["flat", "view"])
+        self.chat_header = Adw.HeaderBar(css_classes=["flat", "view"], show_start_title_buttons=False, show_end_title_buttons=True)
         self.chat_header.set_title_widget(
             Gtk.Label(label=_("Chat"), css_classes=["title"])
         )
@@ -140,7 +140,7 @@ def __init__(self, *args, **kwargs):
             orientation=Gtk.Orientation.VERTICAL, hexpand=True
         )
         self.chat_panel_header = Adw.HeaderBar(
-            css_classes=["flat"], show_end_title_buttons=False
+            css_classes=["flat"], show_end_title_buttons=False, show_start_title_buttons=True
         )
         self.chat_panel_header.set_title_widget(
             Gtk.Label(label=_("History"), css_classes=["title"])
@@ -176,7 +176,7 @@ def __init__(self, *args, **kwargs):
             orientation=Gtk.Orientation.VERTICAL, css_classes=["background", "view"]
         )
         self.explorer_panel.set_size_request(420, -1)
-        self.explorer_panel_header = Adw.HeaderBar(css_classes=["flat"])
+        self.explorer_panel_header = Adw.HeaderBar(css_classes=["flat"], show_start_title_buttons=False)
         self.explorer_panel.append(self.explorer_panel_header)
         self.folder_blocks_panel = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.explorer_panel.append(self.folder_blocks_panel)
@@ -1426,18 +1426,14 @@ def update_folder(self, *a):
 
                     flow_box = Gtk.FlowBox(vexpand=True)
                     flow_box.set_valign(Gtk.Align.START)
-
-                    if os.path.normpath(self.main_path) == "~":
+                    if os.path.normpath(self.main_path) == "~" or os.path.normpath(self.main_path) == os.path.expanduser("~"):
                         os.chdir(os.path.expanduser("~"))
-                        path = "./.var/app/io.github.qwersyk.Newelle/Newelle"
-                        if not os.path.exists(path):
-                            os.makedirs(path)
+                        fname = "/".join(self.controller.newelle_dir.split("/")[3:])
                         button = Gtk.Button(css_classes=["flat"])
-                        button.set_name(".var/app/io.github.qwersyk.Newelle/Newelle")
+                        button.set_name(fname)
                         button.connect("clicked", self.open_folder)
-
                         icon = File(
-                            self.main_path, ".var/app/io.github.qwersyk.Newelle/Newelle"
+                            self.main_path, fname 
                         )
                         icon.set_css_classes(["large"])
                         icon.set_valign(Gtk.Align.END)
@@ -1547,9 +1543,11 @@ def handle_main_block_change(self, *data):
                 not self.main_program_block.get_reveal_flap()
             )
             self.left_panel_back_button.set_visible(True)
+            self.chat_header.set_show_start_title_buttons(True)
         else:
             self.chat_panel_header.set_show_end_title_buttons(False)
             self.left_panel_back_button.set_visible(False)
+            self.chat_header.set_show_start_title_buttons(False)
 
     # Chat management
     def continue_message(self, button):
@@ -2496,7 +2494,7 @@ def apply_sync():
                     elif code_language == "latex":
                         try:
                             box.append(
-                                DisplayLatex(chunk.text, 100, self.controller.cache_dir)
+                                DisplayLatex(chunk.text, 16, self.controller.cache_dir)
                             )
                         except Exception as e:
                             print(e)
@@ -2535,7 +2533,7 @@ def apply_sync():
                 elif chunk.type == "latex" or chunk.type == "latex_inline":
                     try:
                         box.append(
-                            DisplayLatex(chunk.text, 100, self.controller.cache_dir)
+                            DisplayLatex(chunk.text, 16, self.controller.cache_dir)
                         )
                     except Exception:
                         print(chunk.text)