Fixed: When deleting the last chat it didn't make a new one

This commit is contained in:
jeffser 2024-05-28 22:26:36 -06:00
parent 16f620b034
commit f57427e2c4
3 changed files with 40 additions and 40 deletions

View File

@ -1,6 +1,5 @@
.message-input { .message-input {
background-color: #EBEBEB; background-color: rgba(0,0,0,0);
border-radius: 10px;
} }
.message-text-view { .message-text-view {

View File

@ -130,7 +130,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
else: else:
self.image_button.set_sensitive(False) self.image_button.set_sensitive(False)
self.image_button.set_tooltip_text(_("Only available on selected models")) self.image_button.set_tooltip_text(_("Only available on selected models"))
self.image_button.set_css_classes([]) self.image_button.set_css_classes(["circular"])
self.image_button.get_child().set_icon_name("image-x-generic-symbolic") self.image_button.get_child().set_icon_name("image-x-generic-symbolic")
self.attached_image = {"path": None, "base64": None} self.attached_image = {"path": None, "base64": None}
return False return False
@ -140,7 +140,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
if button and self.bot_message: #STOP BUTTON if button and self.bot_message: #STOP BUTTON
if self.loading_spinner: self.chat_container.remove(self.loading_spinner) if self.loading_spinner: self.chat_container.remove(self.loading_spinner)
if self.verify_if_image_can_be_used(): self.image_button.set_sensitive(True) if self.verify_if_image_can_be_used(): self.image_button.set_sensitive(True)
self.image_button.set_css_classes([]) self.image_button.set_css_classes(["circular"])
self.image_button.get_child().set_icon_name("image-x-generic-symbolic") self.image_button.get_child().set_icon_name("image-x-generic-symbolic")
self.attached_image = {"path": None, "base64": None} self.attached_image = {"path": None, "base64": None}
self.toggle_ui_sensitive(True) self.toggle_ui_sensitive(True)
@ -429,7 +429,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
footer = None footer = None
if part['text'].split("\n")[-1] == parts[-1]['text'].split("\n")[-1]: if part['text'].split("\n")[-1] == parts[-1]['text'].split("\n")[-1]:
footer = "\n\n<small>" + part['text'].split('\n')[-1] + "</small>" footer = "\n<small>" + part['text'].split('\n')[-1] + "</small>"
part['text'] = '\n'.join(part['text'].split("\n")[:-1]) part['text'] = '\n'.join(part['text'].split("\n")[:-1])
part['text'] = part['text'].replace("\n* ", "\n") part['text'] = part['text'].replace("\n* ", "\n")
@ -538,7 +538,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
GLib.idle_add(self.send_button.get_child().set_icon_name, "send-to-symbolic") GLib.idle_add(self.send_button.get_child().set_icon_name, "send-to-symbolic")
GLib.idle_add(self.toggle_ui_sensitive, True) GLib.idle_add(self.toggle_ui_sensitive, True)
if self.verify_if_image_can_be_used(): GLib.idle_add(self.image_button.set_sensitive, True) if self.verify_if_image_can_be_used(): GLib.idle_add(self.image_button.set_sensitive, True)
GLib.idle_add(self.image_button.set_css_classes, []) GLib.idle_add(self.image_button.set_css_classes, ["circular"])
GLib.idle_add(self.image_button.get_child().set_icon_name, "image-x-generic-symbolic") GLib.idle_add(self.image_button.get_child().set_icon_name, "image-x-generic-symbolic")
self.attached_image = {"path": None, "base64": None} self.attached_image = {"path": None, "base64": None}
if response['status'] == 'error': if response['status'] == 'error':
@ -677,13 +677,13 @@ class AlpacaWindow(Adw.ApplicationWindow):
image_data = output.getvalue() image_data = output.getvalue()
self.attached_image["base64"] = base64.b64encode(image_data).decode("utf-8") self.attached_image["base64"] = base64.b64encode(image_data).decode("utf-8")
self.image_button.set_css_classes(["destructive-action"]) self.image_button.set_css_classes(["destructive-action", "circular"])
self.image_button.get_child().set_icon_name("edit-delete-symbolic") self.image_button.get_child().set_icon_name("edit-delete-symbolic")
except Exception as e: except Exception as e:
self.show_toast("error", 5, self.main_overlay) self.show_toast("error", 5, self.main_overlay)
def remove_image(self): def remove_image(self):
self.image_button.set_css_classes([]) self.image_button.set_css_classes(["circular"])
self.image_button.get_child().set_icon_name("image-x-generic-symbolic") self.image_button.get_child().set_icon_name("image-x-generic-symbolic")
self.attached_image = {"path": None, "base64": None} self.attached_image = {"path": None, "base64": None}
@ -705,7 +705,7 @@ class AlpacaWindow(Adw.ApplicationWindow):
self.save_history() self.save_history()
self.update_chat_list() self.update_chat_list()
if len(self.chats['chats'])==0: if len(self.chats['chats'])==0:
self.chat_new() self.new_chat()
def rename_chat(self, old_chat_name, new_chat_name, label_element): def rename_chat(self, old_chat_name, new_chat_name, label_element):
new_chat_name = self.generate_numbered_chat_name(new_chat_name) new_chat_name = self.generate_numbered_chat_name(new_chat_name)

View File

@ -180,62 +180,62 @@
<property name="margin-bottom">12</property> <property name="margin-bottom">12</property>
<property name="margin-start">12</property> <property name="margin-start">12</property>
<property name="margin-end">12</property> <property name="margin-end">12</property>
<child>
<object class="GtkButton" id="image_button">
<signal name="clicked" handler="open_image"/>
<property name="vexpand">false</property>
<property name="valign">3</property>
<property name="sensitive">false</property>
<property name="tooltip-text" translatable="yes">Only available on selected models</property>
<child>
<object class="AdwButtonContent">
<property name="icon-name">image-x-generic-symbolic</property>
</object>
</child>
</object>
</child>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<style> <style>
<class name="card"/>
<class name="message-input"/> <class name="message-input"/>
</style> </style>
<child> <child>
<object class="GtkScrolledWindow"> <object class="GtkScrolledWindow">
<property name="margin-start">12</property> <property name="margin-start">12</property>
<property name="margin-end">12</property> <property name="margin-end">12</property>
<style>
<class name="message-input"/>
<class name="undershoot-bottom"/>
<class name="undershoot-top"/>
</style>
<child> <child>
<object class="GtkTextView" id="message_text_view"> <object class="GtkTextView" id="message_text_view">
<property name="wrap-mode">word</property> <property name="wrap-mode">word</property>
<property name="top-margin">6</property> <property name="top-margin">6</property>
<property name="bottom-margin">6</property> <property name="bottom-margin">6</property>
<property name="margin-end">12</property>
<property name="hexpand">true</property> <property name="hexpand">true</property>
<style> <style>
<class name="message-text-view"/> <class name="message-input"/>
</style> </style>
</object> </object>
</child> </child>
</object> </object>
</child> </child>
</object> </object>
</child> </child>
<child> <child>
<object class="GtkBox"> <object class="GtkButton" id="send_button">
<property name="orientation">1</property> <signal name="clicked" handler="send_message"/>
<property name="spacing">12</property> <property name="vexpand">false</property>
<property name="valign">3</property>
<style>
<class name="suggested-action"/>
<class name="circular"/>
</style>
<child> <child>
<object class="GtkButton" id="send_button"> <object class="AdwButtonContent">
<signal name="clicked" handler="send_message"/> <property name="icon-name">send-to-symbolic</property>
<style>
<class name="suggested-action"/>
</style>
<child>
<object class="AdwButtonContent">
<property name="label" translatable="yes">Send</property>
<property name="icon-name">send-to-symbolic</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton" id="image_button">
<signal name="clicked" handler="open_image"/>
<property name="sensitive">false</property>
<property name="tooltip-text" translatable="yes">Only available on selected models</property>
<child>
<object class="AdwButtonContent">
<property name="label" translatable="yes">Image</property>
<property name="icon-name">image-x-generic-symbolic</property>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>
@ -647,3 +647,4 @@
</object> </object>
</interface> </interface>