Redesign and rewrite accounts and settings dialog into a combined one

6 files changed, 97 insertions, 215 deletions

diff --git a/plugins/openpgp/CMakeLists.txt b/plugins/openpgp/CMakeLists.txt
index 6ed7bf53..d2ac6d73 100644
--- a/plugins/openpgp/CMakeLists.txt
+++ b/plugins/openpgp/CMakeLists.txt
@@ -7,6 +7,7 @@ gettext_compile(${GETTEXT_PACKAGE} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/po TAR
 
 
 find_packages(OPENPGP_PACKAGES REQUIRED
+    Adwaita
     Gee
     GLib
     GModule
@@ -14,19 +15,10 @@ find_packages(OPENPGP_PACKAGES REQUIRED
     GTK4
 )
 
-set(RESOURCE_LIST
-    account_settings_item.ui
-)
-
-compile_gresources(
-    OPENPGP_GRESOURCES_TARGET
-    OPENPGP_GRESOURCES_XML
-    TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
-    TYPE EMBED_C
-    RESOURCES ${RESOURCE_LIST}
-    PREFIX /im/dino/Dino/openpgp
-    SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
-)
+set(OPENPGP_DEFINITIONS)
+if(Adwaita_VERSION VERSION_GREATER_EQUAL "1.4")
+    set(OPENPGP_DEFINITIONS ${OPENPGP_DEFINITIONS} Adw_1_4)
+endif()
 
 vala_precompile(OPENPGP_VALA_C
 SOURCES
@@ -35,10 +27,10 @@ SOURCES
     src/file_transfer/file_decryptor.vala
     src/file_transfer/file_encryptor.vala
 
-    src/account_settings_entry.vala
     src/contact_details_provider.vala
     src/database.vala
     src/encryption_list_entry.vala
+    src/encryption_preferences_entry.vala
     src/manager.vala
     src/plugin.vala
     src/register_plugin.vala
@@ -53,12 +45,12 @@ CUSTOM_VAPIS
     ${CMAKE_BINARY_DIR}/exports/dino.vapi
 PACKAGES
     ${OPENPGP_PACKAGES}
-GRESOURCES
-    ${OPENPGP_GRESOURCES_XML}
+DEFINITIONS
+    ${OPENPGP_DEFINITIONS}
 )
 
 add_definitions(${VALA_CFLAGS} -DG_LOG_DOMAIN="OpenPGP" -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\" -DLOCALE_INSTALL_DIR=\"${LOCALE_INSTALL_DIR}\")
-add_library(openpgp SHARED ${OPENPGP_VALA_C} ${OPENPGP_GRESOURCES_TARGET} src/gpgme_fix.c)
+add_library(openpgp SHARED ${OPENPGP_VALA_C} src/gpgme_fix.c)
 add_dependencies(openpgp ${GETTEXT_PACKAGE}-translations)
 target_include_directories(openpgp PRIVATE src)
 target_link_libraries(openpgp libdino gpgme ${OPENPGP_PACKAGES})
diff --git a/plugins/openpgp/data/account_settings_item.ui b/plugins/openpgp/data/account_settings_item.ui
deleted file mode 100644
index 56808be0..00000000
--- a/plugins/openpgp/data/account_settings_item.ui
+++ /dev/null
@@ -1,31 +0,0 @@
-<interface>
-    <requires lib="gtk" version="4.0"/>
-    <object class="GtkStack" id="stack">
-        <child>
-            <object class="GtkStackPage">
-                <property name="name">label</property>
-                <property name="child">
-                    <object class="GtkButton" id="button">
-                        <property name="has-frame">0</property>
-                        <property name="sensitive">0</property>
-                        <child>
-                            <object class="GtkLabel" id="label">
-                                <property name="xalign">0</property>
-                            </object>
-                        </child>
-                    </object>
-                </property>
-            </object>
-        </child>
-        <child>
-            <object class="GtkStackPage">
-                <property name="name">entry</property>
-                <property name="child">
-                    <object class="GtkComboBox" id="combobox">
-                        <property name="hexpand">1</property>
-                    </object>
-                </property>
-            </object>
-        </child>
-    </object>
-</interface>
\ No newline at end of file
diff --git a/plugins/openpgp/meson.build b/plugins/openpgp/meson.build
index 806494f2..ec6f5c0e 100644
--- a/plugins/openpgp/meson.build
+++ b/plugins/openpgp/meson.build
@@ -1,5 +1,6 @@
 subdir('po')
 dependencies = [
+    dep_libadwaita,
     dep_dino,
     dep_gee,
     dep_glib,
@@ -10,7 +11,6 @@ dependencies = [
     dep_xmpp_vala,
 ]
 sources = files(
-    'src/account_settings_entry.vala',
     'src/contact_details_provider.vala',
     'src/database.vala',
     'src/encryption_list_entry.vala',
diff --git a/plugins/openpgp/src/account_settings_entry.vala b/plugins/openpgp/src/account_settings_entry.vala
deleted file mode 100644
index 7c99942f..00000000
--- a/plugins/openpgp/src/account_settings_entry.vala
+++ /dev/null
@@ -1,163 +0,0 @@
-using Dino.Entities;
-using Gtk;
-
-namespace Dino.Plugins.OpenPgp {
-
-public class AccountSettingsEntry : Plugins.AccountSettingsEntry {
-
-    private Label label;
-    private Button button;
-    private ComboBox combobox;
-    private Stack stack;
-
-    private Plugin plugin;
-    private Account current_account;
-    private Gee.List<GPG.Key> keys = null;
-    private Gtk.ListStore list_store = new Gtk.ListStore(2, typeof(string), typeof(string?));
-
-    public override string id { get { return "pgp_key_picker"; }}
-
-    public override string name { get { return "OpenPGP"; }}
-
-    public AccountSettingsEntry(Plugin plugin) {
-        this.plugin = plugin;
-
-        Builder builder = new Builder.from_resource("/im/dino/Dino/openpgp/account_settings_item.ui");
-        stack = (Stack) builder.get_object("stack");
-        label = (Label) builder.get_object("label");
-        button = (Button) builder.get_object("button");
-        combobox = (ComboBox) builder.get_object("combobox");
-
-        CellRendererText renderer = new CellRendererText();
-        renderer.set_padding(0, 0);
-        combobox.pack_start(renderer, true);
-        combobox.add_attribute(renderer, "markup", 0);
-        combobox.set_model(list_store);
-
-        button.clicked.connect(on_button_clicked);
-        combobox.changed.connect(key_changed);
-    }
-
-    public override void deactivate() {
-        stack.set_visible_child_name("label");
-    }
-
-    public override void set_account(Account account) {
-        set_account_.begin(account);
-    }
-
-    private async void set_account_(Account account) {
-        this.current_account = account;
-        if (keys == null) {
-            yield fetch_keys();
-            populate_list_store();
-        }
-        activate_current_account();
-    }
-
-    private void on_button_clicked() {
-        activated();
-        stack.set_visible_child_name("entry");
-        combobox.grab_focus();
-        combobox.popup();
-    }
-
-    private void activate_current_account() {
-        combobox.changed.disconnect(key_changed);
-        if (keys == null) {
-            label.set_markup(build_markup_string(_("Key publishing disabled"), _("Error in GnuPG")));
-            return;
-        }
-        if (keys.size == 0) {
-            label.set_markup(build_markup_string(_("Key publishing disabled"), _("No keys available. Generate one!")));
-            return;
-        }
-
-        string? account_key = plugin.db.get_account_key(current_account);
-        int activate_index = 0;
-        for (int i = 0; i < keys.size; i++) {
-            GPG.Key key = keys[i];
-            if (key.fpr == account_key) {
-                activate_index = i + 1;
-            }
-        }
-        combobox.active = activate_index;
-
-        TreeIter selected;
-        combobox.get_active_iter(out selected);
-        set_label_active(selected);
-
-        combobox.changed.connect(key_changed);
-    }
-
-    private void populate_list_store() {
-        if (keys == null || keys.size == 0) {
-            return;
-        }
-
-        list_store.clear();
-        TreeIter iter;
-        list_store.append(out iter);
-        list_store.set(iter, 0, build_markup_string(_("Key publishing disabled"), _("Select key") + "<span font_family='monospace' font='8'> \n </span>"), 1, "");
-        for (int i = 0; i < keys.size; i++) {
-            list_store.append(out iter);
-            list_store.set(iter, 0, @"$(Markup.escape_text(keys[i].uids[0].uid))\n<span font_family='monospace' font='8'>$(markup_colorize_id(keys[i].fpr, true))</span><span font='8'> </span>");
-            list_store.set(iter, 1, keys[i].fpr);
-            if (keys[i].fpr == plugin.db.get_account_key(current_account)) {
-                set_label_active(iter, i + 1);
-            }
-        }
-        button.sensitive = true;
-    }
-
-    private async void fetch_keys() {
-        label.set_markup(build_markup_string(_("Loading…"), _("Querying GnuPG")));
-
-        SourceFunc callback = fetch_keys.callback;
-        new Thread<void*> (null, () => { // Querying GnuPG might take some time
-            try {
-                keys = GPGHelper.get_keylist(null, true);
-            } catch (Error e) {
-                warning(e.message);
-            }
-            Idle.add((owned)callback);
-            return null;
-        });
-        yield;
-    }
-
-    private void set_label_active(TreeIter iter, int i = -1) {
-        Value text;
-        list_store.get_value(iter, 0, out text);
-        label.set_markup((string) text);
-        if (i != -1) combobox.active = i;
-    }
-
-    private void key_changed() {
-        TreeIter selected;
-        bool iter_valid = combobox.get_active_iter(out selected);
-        if (iter_valid) {
-            Value key_value;
-            list_store.get_value(selected, 1, out key_value);
-            string? key_id = key_value as string;
-            if (key_id != null) {
-                if (plugin.modules.has_key(current_account)) {
-                    plugin.modules[current_account].set_private_key_id(key_id);
-                }
-                plugin.db.set_account_key(current_account, key_id);
-            }
-            set_label_active(selected);
-            deactivate();
-        }
-    }
-
-    private string build_markup_string(string primary, string secondary) {
-        return @"$(Markup.escape_text(primary))\n<span font='8'>$secondary</span>";
-    }
-
-    public override Object? get_widget(WidgetType type) {
-        if (type != WidgetType.GTK4) return null;
-        return stack;
-    }
-}
-}
\ No newline at end of file
diff --git a/plugins/openpgp/src/encryption_preferences_entry.vala b/plugins/openpgp/src/encryption_preferences_entry.vala
new file mode 100644
index 00000000..4620e173
--- /dev/null
+++ b/plugins/openpgp/src/encryption_preferences_entry.vala
@@ -0,0 +1,86 @@
+using Adw;
+using Dino.Entities;
+using Gtk;
+
+namespace Dino.Plugins.OpenPgp {
+
+    public class PgpPreferencesEntry : Plugins.EncryptionPreferencesEntry {
+
+        private Plugin plugin;
+
+        public PgpPreferencesEntry(Plugin plugin) {
+            this.plugin = plugin;
+        }
+
+        public override Object? get_widget(Account account, WidgetType type) {
+            if (type != WidgetType.GTK4) return null;
+            StringList string_list = new StringList(null);
+            string_list.append(_("Querying GnuPG"));
+
+            Adw.PreferencesGroup preferences_group = new Adw.PreferencesGroup() { title="OpenPGP" };
+            populate_string_list.begin(account, preferences_group);
+
+            return preferences_group;
+        }
+
+        public override string id { get { return "pgp_preferences_encryption"; }}
+
+        private async void populate_string_list(Account account, Adw.PreferencesGroup preferences_group) {
+            var keys = yield get_pgp_keys();
+
+            if (keys == null) {
+                preferences_group.add(new Adw.ActionRow() { title="Announce key", subtitle="Error in GnuPG" });
+                return;
+            }
+            if (keys.size == 0) {
+                preferences_group.add(new Adw.ActionRow() { title="Announce key", subtitle="No keys available. Generate one!" });
+                return;
+            }
+
+            StringList string_list = new StringList(null);
+#if Adw_1_4
+            var drop_down = new Adw.ComboRow() { title = "Announce key" };
+            drop_down.model = string_list;
+            preferences_group.add(drop_down);
+#else
+            var view = new Adw.ActionRow() { title = "Announce key" };
+            var drop_down = new DropDown(string_list, null) { valign = Align.CENTER };
+            view.activatable_widget = drop_down;
+            view.add_suffix(drop_down);
+            preferences_group.add(view);
+#endif
+
+            string_list.append(_("Disabled"));
+            for (int i = 0; i < keys.size; i++) {
+                string_list.append(@"$(keys[i].uids[0].uid)\n$(keys[i].fpr.substring(24, 16))");
+                if (keys[i].fpr == plugin.db.get_account_key(account)) {
+                    drop_down.selected = i + 1;
+                }
+            }
+
+            drop_down.notify["selected"].connect(() => {
+                var key_id = drop_down.selected == 0 ? "" : keys[(int)drop_down.selected - 1].fpr;
+                if (plugin.modules.has_key(account)) {
+                    plugin.modules[account].set_private_key_id(key_id);
+                }
+                plugin.db.set_account_key(account, key_id);
+            });
+        }
+
+        private static async Gee.List<GPG.Key> get_pgp_keys() {
+            Gee.List<GPG.Key> keys = null;
+            SourceFunc callback = get_pgp_keys.callback;
+            new Thread<void*> (null, () => { // Querying GnuPG might take some time
+                try {
+                    keys = GPGHelper.get_keylist(null, true);
+                } catch (Error e) {
+                    warning(e.message);
+                }
+                Idle.add((owned)callback);
+                return null;
+            });
+            yield;
+            return keys;
+        }
+    }
+}
\ No newline at end of file
diff --git a/plugins/openpgp/src/plugin.vala b/plugins/openpgp/src/plugin.vala
index 324b8652..463058f3 100644
--- a/plugins/openpgp/src/plugin.vala
+++ b/plugins/openpgp/src/plugin.vala
@@ -13,18 +13,16 @@ public class Plugin : Plugins.RootInterface, Object {
     public HashMap<Account, Module> modules = new HashMap<Account, Module>(Account.hash_func, Account.equals_func);
 
     private EncryptionListEntry list_entry;
-    private AccountSettingsEntry settings_entry;
     private ContactDetailsProvider contact_details_provider;
 
     public void registered(Dino.Application app) {
         this.app = app;
         this.db = new Database(Path.build_filename(Application.get_storage_dir(), "pgp.db"));
         this.list_entry = new EncryptionListEntry(app.stream_interactor, db);
-        this.settings_entry = new AccountSettingsEntry(this);
         this.contact_details_provider = new ContactDetailsProvider(app.stream_interactor);
 
         app.plugin_registry.register_encryption_list_entry(list_entry);
-        app.plugin_registry.register_account_settings_entry(settings_entry);
+        app.plugin_registry.register_encryption_preferences_entry(new PgpPreferencesEntry(this));
         app.plugin_registry.register_contact_details_entry(contact_details_provider);
         app.stream_interactor.module_manager.initialize_account_modules.connect(on_initialize_account_modules);