Rewrite contact details dialog

5 files changed, 3 insertions, 354 deletions

diff --git a/main/src/ui/contact_details/blocking_provider.vala b/main/src/ui/contact_details/blocking_provider.vala
deleted file mode 100644
index 7e4a475d..00000000
--- a/main/src/ui/contact_details/blocking_provider.vala
+++ /dev/null
@@ -1,36 +0,0 @@
-using Gtk;
-
-using Dino.Entities;
-
-namespace Dino.Ui.ContactDetails {
-
-public class BlockingProvider : Plugins.ContactDetailsProvider, Object {
-    public string id { get { return "blocking"; } }
-
-    private StreamInteractor stream_interactor;
-
-    public BlockingProvider(StreamInteractor stream_interactor) {
-        this.stream_interactor = stream_interactor;
-    }
-
-    public void populate(Conversation conversation, Plugins.ContactDetails contact_details, Plugins.WidgetType type) {
-        if (type != Plugins.WidgetType.GTK4) return;
-        if (conversation.type_ != Conversation.Type.CHAT) return;
-
-        if (stream_interactor.get_module(BlockingManager.IDENTITY).is_supported(conversation.account)) {
-            bool is_blocked = stream_interactor.get_module(BlockingManager.IDENTITY).is_blocked(conversation.account, conversation.counterpart);
-            Switch sw = new Switch() { active=is_blocked, valign=Align.CENTER };
-            sw.state_set.connect((state) => {
-                if (state) {
-                    stream_interactor.get_module(BlockingManager.IDENTITY).block(conversation.account, conversation.counterpart);
-                } else {
-                    stream_interactor.get_module(BlockingManager.IDENTITY).unblock(conversation.account, conversation.counterpart);
-                }
-                return false;
-            });
-            contact_details.add(_("Settings"), _("Block"), _("Communication and status updates in either direction are blocked"), sw);
-        }
-    }
-}
-
-}
diff --git a/main/src/ui/contact_details/dialog.vala b/main/src/ui/contact_details/dialog.vala
deleted file mode 100644
index c897fe4e..00000000
--- a/main/src/ui/contact_details/dialog.vala
+++ /dev/null
@@ -1,159 +0,0 @@
-using Gee;
-using Gtk;
-using Markup;
-using Pango;
-
-using Dino.Entities;
-
-namespace Dino.Ui.ContactDetails {
-
-[GtkTemplate (ui = "/im/dino/Dino/contact_details_dialog.ui")]
-public class Dialog : Gtk.Dialog {
-
-    [GtkChild] public unowned AvatarPicture avatar;
-    [GtkChild] public unowned Util.EntryLabelHybrid name_hybrid;
-    [GtkChild] public unowned Label name_label;
-    [GtkChild] public unowned Label jid_label;
-    [GtkChild] public unowned Label account_label;
-    [GtkChild] public unowned Box main_box;
-
-    private StreamInteractor stream_interactor;
-    private Conversation conversation;
-
-    private Plugins.ContactDetails contact_details = new Plugins.ContactDetails();
-    private HashMap<string, ListBox> categories = new HashMap<string, ListBox>();
-    private Util.LabelHybridGroup hybrid_group = new Util.LabelHybridGroup();
-
-    construct {
-        name_hybrid.label.attributes = new AttrList();
-        name_hybrid.label.attributes.insert(attr_weight_new(Weight.BOLD));
-    }
-
-    public Dialog(StreamInteractor stream_interactor, Conversation conversation) {
-        Object(use_header_bar : Util.use_csd() ? 1 : 0);
-        this.stream_interactor = stream_interactor;
-        this.conversation = conversation;
-
-        title = conversation.type_ == Conversation.Type.GROUPCHAT ? _("Conference Details") : _("Contact Details");
-        if (Util.use_csd()) {
-            // TODO get_header_bar directly returns a HeaderBar in vala > 0.48
-            Box titles_box = new Box(Orientation.VERTICAL, 0) { valign=Align.CENTER };
-            var title_label = new Label(title);
-            title_label.attributes = new AttrList();
-            title_label.attributes.insert(Pango.attr_weight_new(Weight.BOLD));
-            titles_box.append(title_label);
-            var subtitle_label = new Label(Util.get_conversation_display_name(stream_interactor, conversation));
-            subtitle_label.attributes = new AttrList();
-            subtitle_label.attributes.insert(Pango.attr_scale_new(Pango.Scale.SMALL));
-            subtitle_label.add_css_class("dim-label");
-            titles_box.append(subtitle_label);
-
-            get_header_bar().set_title_widget(titles_box);
-        }
-        setup_top();
-
-        contact_details.add.connect(add_entry);
-
-        Application app = GLib.Application.get_default() as Application;
-        app.plugin_registry.register_contact_details_entry(new SettingsProvider(stream_interactor));
-        app.plugin_registry.register_contact_details_entry(new BlockingProvider(stream_interactor));
-        app.plugin_registry.register_contact_details_entry(new MucConfigFormProvider(stream_interactor));
-        app.plugin_registry.register_contact_details_entry(new PermissionsProvider(stream_interactor));
-
-        foreach (Plugins.ContactDetailsProvider provider in app.plugin_registry.contact_details_entries) {
-            provider.populate(conversation, contact_details, Plugins.WidgetType.GTK4);
-        }
-
-        close_request.connect(() => {
-            contact_details.save();
-            return false;
-        });
-    }
-
-    private void setup_top() {
-        if (conversation.type_ == Conversation.Type.CHAT) {
-            name_label.visible = false;
-            jid_label.margin_start = new Button().get_style_context().get_padding().left + 1;
-            name_hybrid.text = Util.get_conversation_display_name(stream_interactor, conversation);
-            close_request.connect(() => {
-                if (name_hybrid.text != Util.get_conversation_display_name(stream_interactor, conversation)) {
-                    stream_interactor.get_module(RosterManager.IDENTITY).set_jid_handle(conversation.account, conversation.counterpart, name_hybrid.text);
-                }
-                return false;
-            });
-        } else {
-            name_hybrid.visible = false;
-            name_label.label = Util.get_conversation_display_name(stream_interactor, conversation);
-        }
-        jid_label.label = conversation.counterpart.to_string();
-        account_label.label = "via " + conversation.account.bare_jid.to_string();
-        avatar.model = new ViewModel.CompatAvatarPictureModel(stream_interactor).set_conversation(conversation);
-    }
-
-    private void add_entry(string category, string label, string? description, Object wo) {
-        if (!(wo is Widget)) return;
-        Widget w = (Widget) wo;
-        add_category(category);
-
-        ListBoxRow list_row = new ListBoxRow() { activatable=false };
-        Box row = new Box(Orientation.HORIZONTAL, 20) { margin_start=15, margin_end=15, margin_top=3, margin_bottom=3 };
-        list_row.set_child(row);
-        Label label_label = new Label(label) { xalign=0, yalign=0.5f, hexpand=true };
-        if (description != null && description != "") {
-            Box box = new Box(Orientation.VERTICAL, 0);
-            box.append(label_label);
-            Label desc_label = new Label("") { xalign=0, yalign=0.5f, hexpand=true };
-            desc_label.set_markup("<span size='small'>%s</span>".printf(Markup.escape_text(description)));
-            desc_label.add_css_class("dim-label");
-            box.append(desc_label);
-            row.append(box);
-        } else {
-            row.append(label_label);
-        }
-
-        Widget widget = w;
-        if (widget.get_type().is_a(typeof(Entry))) {
-            Util.EntryLabelHybrid hybrid = new Util.EntryLabelHybrid.wrap(widget as Entry) { xalign=1 };
-            hybrid_group.add(hybrid);
-            widget = hybrid;
-        } else if (widget.get_type().is_a(typeof(ComboBoxText))) {
-            Util.ComboBoxTextLabelHybrid hybrid = new Util.ComboBoxTextLabelHybrid.wrap(widget as ComboBoxText) { xalign=1 };
-            hybrid_group.add(hybrid);
-            widget = hybrid;
-        }
-        widget.margin_bottom = 5;
-        widget.margin_top = 5;
-
-
-        row.append(widget);
-        categories[category].append(list_row);
-
-        int width = get_content_area().get_width();
-        int pref_height, pref_width;
-        get_content_area().measure(Orientation.VERTICAL, width, null, out pref_height, null, null);
-        default_height = pref_height + 48;
-    }
-
-    private void add_category(string category) {
-        if (!categories.has_key(category)) {
-            ListBox list_box = new ListBox() { selection_mode=SelectionMode.NONE };
-            categories[category] = list_box;
-            list_box.set_header_func((row, before_row) => {
-                if (row.get_header() == null && before_row != null) {
-                    row.set_header(new Separator(Orientation.HORIZONTAL));
-                }
-            });
-            Box box = new Box(Orientation.VERTICAL, 5) { margin_top=12, margin_bottom=12 };
-            Label category_label = new Label("") { xalign=0 };
-            category_label.set_markup(@"<b>$(Markup.escape_text(category))</b>");
-            box.append(category_label);
-            Frame frame = new Frame(null);
-            frame.set_child(list_box);
-            box.append(frame);
-            main_box.append(box);
-        }
-    }
-}
-
-}
-
diff --git a/main/src/ui/contact_details/muc_config_form_provider.vala b/main/src/ui/contact_details/muc_config_form_provider.vala
deleted file mode 100644
index 1244a759..00000000
--- a/main/src/ui/contact_details/muc_config_form_provider.vala
+++ /dev/null
@@ -1,93 +0,0 @@
-using Gee;
-using Gtk;
-
-using Dino.Entities;
-using Xmpp.Xep;
-
-namespace Dino.Ui.ContactDetails {
-
-public class MucConfigFormProvider : Plugins.ContactDetailsProvider, Object {
-    public string id { get { return "muc_config_form"; } }
-    private StreamInteractor stream_interactor;
-
-    public MucConfigFormProvider(StreamInteractor stream_interactor) {
-        this.stream_interactor = stream_interactor;
-    }
-
-    public void populate(Conversation conversation, Plugins.ContactDetails contact_details, Plugins.WidgetType type) {
-        if (type != Plugins.WidgetType.GTK4) return;
-        if (conversation.type_ == Conversation.Type.GROUPCHAT) {
-            Xmpp.XmppStream? stream = stream_interactor.get_stream(conversation.account);
-            if (stream == null) return;
-
-            stream_interactor.get_module(MucManager.IDENTITY).get_config_form.begin(conversation.account, conversation.counterpart, (_, res) => {
-                DataForms.DataForm? data_form = stream_interactor.get_module(MucManager.IDENTITY).get_config_form.end(res);
-                if (data_form == null) return;
-
-                for (int i = 0; i < data_form.fields.size; i++) {
-                    DataForms.DataForm.Field field = data_form.fields[i];
-                    add_field(field, contact_details);
-                }
-
-                string config_backup = data_form.stanza_node.to_string();
-                contact_details.save.connect(() => {
-                    // Only send the config form if something was changed
-                    if (config_backup != data_form.stanza_node.to_string()) {
-                        stream_interactor.get_module(MucManager.IDENTITY).set_config_form.begin(conversation.account, conversation.counterpart, data_form);
-                    }
-                });
-            });
-        }
-    }
-
-    public static void add_field(DataForms.DataForm.Field field, Plugins.ContactDetails contact_details) {
-        string label = field.label ?? "";
-        string? desc = null;
-
-        if (field.var != null) {
-            switch (field.var) {
-                case "muc#roomconfig_roomname":
-                    label = _("Name of the room");
-                    break;
-                case "muc#roomconfig_roomdesc":
-                    label = _("Description of the room");
-                    break;
-                case "muc#roomconfig_persistentroom":
-                    label = _("Persistent");
-                    desc = _("The room will persist after the last occupant leaves");
-                    break;
-                case "muc#roomconfig_publicroom":
-                    label = _("Publicly searchable");
-                    break;
-                case "muc#roomconfig_changesubject":
-                    label = _("Occupants may change the subject");
-                    break;
-                case "muc#roomconfig_whois":
-                    label = _("Permission to view JIDs");
-                    desc = _("Who is allowed to view the occupants' JIDs?");
-                    break;
-                case "muc#roomconfig_roomsecret":
-                    label = _("Password");
-                    desc = _("A password to restrict access to the room");
-                    break;
-                case "muc#roomconfig_moderatedroom":
-                    label = _("Moderated");
-                    desc = _("Only occupants with voice may send messages");
-                    break;
-                case "muc#roomconfig_membersonly":
-                    label = _("Members only");
-                    desc = _("Only members may enter the room");
-                    break;
-                case "muc#roomconfig_historylength":
-                    label = _("Message history");
-                    desc = _("Maximum amount of backlog issued by the room");
-                    break;
-            }
-        }
-
-        Widget? widget = Util.get_data_form_field_widget(field);
-        if (widget != null) contact_details.add(_("Room Configuration"), label, desc, widget);
-    }
-}
-
-}
diff --git a/main/src/ui/contact_details/permissions_provider.vala b/main/src/ui/contact_details/permissions_provider.vala
index ed0756e8..c7ea4a1c 100644
--- a/main/src/ui/contact_details/permissions_provider.vala
+++ b/main/src/ui/contact_details/permissions_provider.vala
@@ -22,7 +22,7 @@ public class PermissionsProvider : Plugins.ContactDetailsProvider, Object {
         if (stream_interactor.get_module(MucManager.IDENTITY).get_role(own_jid, conversation.account) == Xmpp.Xep.Muc.Role.VISITOR){
             Button voice_request = new Button.with_label(_("Request"));
             voice_request.clicked.connect(()=>stream_interactor.get_module(MucManager.IDENTITY).request_voice(conversation.account, conversation.counterpart));
-            contact_details.add(_("Permissions"), _("Request permission to send messages"), "", voice_request);
+            contact_details.add("Permissions", _("Request permission to send messages"), "", voice_request);
         }
     }
 }
diff --git a/main/src/ui/contact_details/settings_provider.vala b/main/src/ui/contact_details/settings_provider.vala
index 8121e5b1..6a680f64 100644
--- a/main/src/ui/contact_details/settings_provider.vala
+++ b/main/src/ui/contact_details/settings_provider.vala
@@ -9,8 +9,8 @@ public class SettingsProvider : Plugins.ContactDetailsProvider, Object {
 
     private StreamInteractor stream_interactor;
 
-    private string DETAILS_HEADLINE_CHAT = _("Settings");
-    private string DETAILS_HEADLINE_ROOM = _("Local Settings");
+    private string DETAILS_HEADLINE_CHAT = "Settings";
+    private string DETAILS_HEADLINE_ROOM = "Local Settings";
 
     public SettingsProvider(StreamInteractor stream_interactor) {
         this.stream_interactor = stream_interactor;
@@ -33,28 +33,7 @@ public class SettingsProvider : Plugins.ContactDetailsProvider, Object {
             contact_details.add(DETAILS_HEADLINE_CHAT, _("Send read receipts"), "", combobox_marker);
             combobox_marker.active_id = get_setting_id(conversation.send_marker);
             combobox_marker.changed.connect(() => { conversation.send_marker = get_setting(combobox_marker.active_id); } );
-
-            ComboBoxText combobox_notifications = get_combobox(Dino.Application.get_default().settings.notifications);
-            contact_details.add(DETAILS_HEADLINE_CHAT, _("Notifications"), "", combobox_notifications);
-            combobox_notifications.active_id = get_notify_setting_id(conversation.notify_setting);
-            combobox_notifications.changed.connect(() => { conversation.notify_setting = get_notify_setting(combobox_notifications.active_id); } );
-        } else if (conversation.type_ == Conversation.Type.GROUPCHAT) {
-            ComboBoxText combobox = new ComboBoxText();
-            combobox.append("default", get_notify_setting_string(Conversation.NotifySetting.DEFAULT, conversation.get_notification_default_setting(stream_interactor)));
-            combobox.append("highlight", get_notify_setting_string(Conversation.NotifySetting.HIGHLIGHT));
-            combobox.append("on", get_notify_setting_string(Conversation.NotifySetting.ON));
-            combobox.append("off", get_notify_setting_string(Conversation.NotifySetting.OFF));
-            contact_details.add(DETAILS_HEADLINE_ROOM, _("Notifications"), "", combobox);
-
-            combobox.active_id = get_notify_setting_id(conversation.notify_setting);
-            combobox.changed.connect(() => { conversation.notify_setting = get_notify_setting(combobox.active_id); } );
         }
-
-        Switch pinned_switch = new Switch() { valign=Align.CENTER };
-        string category = conversation.type_ == Conversation.Type.GROUPCHAT ? DETAILS_HEADLINE_ROOM : DETAILS_HEADLINE_CHAT;
-        contact_details.add(category, _("Pin conversation"), _("Pins the conversation to the top of the conversation list"), pinned_switch);
-        pinned_switch.state = conversation.pinned != 0;
-        pinned_switch.state_set.connect((state) => { conversation.pinned = state ? 1 : 0; return false; });
     }
 
     private Conversation.Setting get_setting(string id) {
@@ -69,34 +48,6 @@ public class SettingsProvider : Plugins.ContactDetailsProvider, Object {
         assert_not_reached();
     }
 
-    private Conversation.NotifySetting get_notify_setting(string id) {
-        switch (id) {
-            case "default":
-                return Conversation.NotifySetting.DEFAULT;
-            case "on":
-                return Conversation.NotifySetting.ON;
-            case "off":
-                return Conversation.NotifySetting.OFF;
-            case "highlight":
-                return Conversation.NotifySetting.HIGHLIGHT;
-        }
-        assert_not_reached();
-    }
-
-    private string get_notify_setting_string(Conversation.NotifySetting setting, Conversation.NotifySetting? default_setting = null) {
-        switch (setting) {
-            case Conversation.NotifySetting.ON:
-                return _("On");
-            case Conversation.NotifySetting.OFF:
-                return _("Off");
-            case Conversation.NotifySetting.HIGHLIGHT:
-                return _("Only when mentioned");
-            case Conversation.NotifySetting.DEFAULT:
-                return _("Default: %s").printf(get_notify_setting_string(default_setting));
-        }
-        assert_not_reached();
-    }
-
     private string get_setting_id(Conversation.Setting setting) {
         switch (setting) {
             case Conversation.Setting.DEFAULT:
@@ -109,20 +60,6 @@ public class SettingsProvider : Plugins.ContactDetailsProvider, Object {
         assert_not_reached();
     }
 
-    private string get_notify_setting_id(Conversation.NotifySetting setting) {
-        switch (setting) {
-            case Conversation.NotifySetting.DEFAULT:
-                return "default";
-            case Conversation.NotifySetting.ON:
-                return "on";
-            case Conversation.NotifySetting.OFF:
-                return "off";
-            case Conversation.NotifySetting.HIGHLIGHT:
-                return "highlight";
-        }
-        assert_not_reached();
-    }
-
     private ComboBoxText get_combobox(bool default_val) {
         ComboBoxText combobox = new ComboBoxText();
         combobox = new ComboBoxText();