Merge 8f7675089b0591be9fe04763a20879350e19c8b1 into d625058d76efc9e344dd5e1239a4b040a7d2519a

main/data/gresource.xml

@@ -46,7 +46,6 @@
     <file>icons/scalable/status/dino-bell-large-none-symbolic.svg</file>
     <file>icons/scalable/status/dino-bell-large-symbolic.svg</file>
     <file>icons/scalable/status/dino-block-symbolic.svg</file>
-    <file>icons/scalable/status/dino-mention-symbolic.svg</file>
     <file>icons/scalable/status/dino-party-popper-symbolic.svg</file>
     <file>icons/scalable/status/dino-security-high-symbolic.svg</file>
     <file>icons/scalable/status/dino-status-away.svg</file>
@@ -73,7 +72,6 @@
     <file>menu_encryption.ui</file>
     <file>message_item_widget_edit_mode.ui</file>
     <file>muc_member_list_row.ui</file>
-    <file>mute_toggle.ui</file>
     <file>occupant_list.ui</file>
     <file>occupant_list_item.ui</file>
     <file>quote.ui</file>

main/data/icons/scalable/status/dino-mention-symbolic.svg

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 7.664062 0.0078125 c -2.613281 0.1093755 -5.003906 1.4882815 -6.410156 3.6953125 c -1.90625 3 -1.605468 6.898437 0.734375 9.574219 c 2.347657 2.667968 6.175781 3.472656 9.398438 1.96875 c 0.5 -0.230469 0.714843 -0.828125 0.484375 -1.328125 c -0.234375 -0.5 -0.828125 -0.714844 -1.332032 -0.484375 c -2.414062 1.132812 -5.289062 0.53125 -7.046874 -1.476563 c -1.761719 -2.003906 -1.988282 -4.933593 -0.550782 -7.179687 c 1.429688 -2.253906 4.175782 -3.285156 6.738282 -2.539063 c 2.5625 0.746094 4.324218 3.09375 4.320312 5.761719 v 0.039062 v 0.960938 c 0 0.359375 -0.1875 0.683594 -0.5 0.863281 c -0.308594 0.179688 -0.6875 0.179688 -1 0 c -0.308594 -0.175781 -0.5 -0.507812 -0.5 -0.863281 v -1 c 0 -2.199219 -1.800781 -4 -4 -4 c -2.195312 0 -4 1.800781 -4 4 c 0 2.195312 1.804688 4 4 4 c 1.046875 0 1.992188 -0.417969 2.707031 -1.078125 c 0.222657 0.265625 0.488281 0.496094 0.792969 0.675781 c 0.929688 0.535156 2.074219 0.535156 3 0 c 0.929688 -0.535156 1.5 -1.527344 1.5 -2.597656 v -1 c 0 -3.554688 -2.347656 -6.683594 -5.761719 -7.683594 c -0.835937 -0.2421872 -1.703125 -0.347656 -2.574219 -0.3085935 z m 0.335938 5.9921875 c 1.117188 0 2 0.882812 2 2 c 0 1.113281 -0.882812 2 -2 2 c -1.113281 0 -2 -0.886719 -2 -2 c 0 -1.117188 0.886719 -2 2 -2 z m 0 0" fill="#222222"/>
-</svg>

main/data/mute_toggle.ui

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-    <requires lib="Adw" version="1.0"/>
-    <requires lib="gtk" version="4.0"/>
-    <object class="AdwToggleGroup" id="mute_switch_chat">
-        <child>
-            <object class="AdwToggle">
-                <property name="icon-name">dino-bell-large</property>
-                <property name="name">notification.on</property>
-                <property name="tooltip" translatable="yes">Enable notifications</property>
-            </object>
-        </child>
-        <child>
-            <object class="AdwToggle">
-                <property name="icon-name">dino-bell-large-none</property>
-                <property name="name">notification.off</property>
-                <property name="tooltip" translatable="yes">Disable notifications</property>
-            </object>
-        </child>
-    </object>
-    <object class="AdwToggleGroup" id="mute_switch_muc">
-        <child>
-            <object class="AdwToggle">
-                <property name="icon-name">dino-bell-large</property>
-                <property name="name">notification.on</property>
-                <property name="tooltip" translatable="yes">Notify for all messages</property>
-            </object>
-        </child>
-        <child>
-            <object class="AdwToggle">
-                <property name="icon-name">dino-mention-symbolic</property>
-                <property name="name">notification.highlight</property>
-                <property name="tooltip" translatable="yes">Notify only for mentions</property>
-            </object>
-        </child>
-        <child>
-            <object class="AdwToggle">
-                <property name="icon-name">dino-bell-large-none</property>
-                <property name="name">notification.off</property>
-                <property name="tooltip" translatable="yes">Disable notifications</property>
-            </object>
-        </child>
-    </object>
-    <object class="GtkButton" id="reset_button">
-        <property name="icon-name">edit-clear-symbolic</property>
-        <property name="name">notification.default</property>
-        <property name="tooltip-text" translatable="yes">Reset to default</property>
-    </object>
-</interface>

main/src/ui/conversation_selector/conversation_selector_row.vala

@@ -22,8 +22,6 @@ public class ConversationSelectorRow : ListBoxRow {
     [GtkChild] public unowned Revealer main_revealer;
 
     private PopoverMenu popover_menu;
-    private Adw.ToggleGroup mute_switch;
-    private Button mute_reset_button;
 
     public Conversation conversation { get; private set; }
 
@@ -97,24 +95,6 @@ public class ConversationSelectorRow : ListBoxRow {
         });
 
         popover_menu = new Gtk.PopoverMenu.from_model(get_popover_menu_model());
-
-        Builder builder = new Builder.from_resource("/im/dino/Dino/mute_toggle.ui");
-        switch (conversation.type_) {
-            case Conversation.Type.CHAT:
-            case Conversation.Type.GROUPCHAT_PM:
-                mute_switch = (Adw.ToggleGroup) builder.get_object("mute_switch_chat");
-                break;
-            case Conversation.Type.GROUPCHAT:
-                mute_switch = (Adw.ToggleGroup) builder.get_object("mute_switch_muc");
-                break;
-        }
-        mute_reset_button = (Button) builder.get_object("reset_button");
-        Box mute_switch_wrapper = new Box(Orientation.HORIZONTAL, 0);
-        Box separator = new Box(Orientation.HORIZONTAL, 0) { hexpand=true };
-        mute_switch_wrapper.append(mute_switch);
-        mute_switch_wrapper.append(separator);
-        mute_switch_wrapper.append(mute_reset_button);
-        popover_menu.add_child(mute_switch_wrapper, "mute-switch");
         popover_menu.set_parent(this);
 
         GestureClick right_click = new GestureClick();
@@ -199,10 +179,6 @@ public class ConversationSelectorRow : ListBoxRow {
         menu_item_close_conversation.set_action_and_target_value("app.close-conversation", new GLib.Variant.int32(conversation.id));
         menu.append_item(menu_item_close_conversation);
 
-        MenuItem menu_item_mute_switch = new MenuItem(null, null);
-        menu_item_mute_switch.set_attribute_value("custom", new GLib.Variant.string("mute-switch"));
-        menu.append_item(menu_item_mute_switch);
-
         return menu;
     }