From ea5d3e50c6fd63ae3a151c883f691e76b9cb1018 Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Mon, 3 Apr 2017 19:20:31 +0200
Subject: [PATCH] Start private conversation with MUC occupant via occupant
 menu

---
 libdino/src/service/database.vala             |  4 +-
 main/CMakeLists.txt                           |  5 +-
 main/data/occupant_list.ui                    | 15 +---
 main/data/occupant_list_item.ui               |  7 +-
 main/src/ui/conversation_titlebar.vala        |  7 +-
 .../list.vala}                                | 22 +++---
 .../list_row.vala}                            | 13 ++-
 main/src/ui/occupant_menu/view.vala           | 79 +++++++++++++++++++
 qlite/src/table.vala                          |  2 +-
 9 files changed, 116 insertions(+), 38 deletions(-)
 rename main/src/ui/{occupant_list.vala => occupant_menu/list.vala} (81%)
 rename main/src/ui/{occupant_list_row.vala => occupant_menu/list_row.vala} (65%)
 create mode 100644 main/src/ui/occupant_menu/view.vala

diff --git a/libdino/src/service/database.vala b/libdino/src/service/database.vala
index ad12cbac..797fd6c9 100644
--- a/libdino/src/service/database.vala
+++ b/libdino/src/service/database.vala
@@ -6,7 +6,7 @@ using Dino.Entities;
 namespace Dino {
 
 public class Database : Qlite.Database {
-    private const int VERSION = 0;
+    private const int VERSION = 1;
 
     public class AccountTable : Table {
         public Column<int> id = new Column.Integer("id") { primary_key = true, auto_increment = true };
@@ -79,7 +79,7 @@ public class Database : Qlite.Database {
         public Column<int> id = new Column.Integer("id") { primary_key = true, auto_increment = true };
         public Column<int> account_id = new Column.Integer("account_id") { not_null = true };
         public Column<int> jid_id = new Column.Integer("jid_id") { not_null = true };
-        public Column<string> resource = new Column.Text("resource");
+        public Column<string> resource = new Column.Text("resource") { min_version=1 };
         public Column<bool> active = new Column.BoolInt("active");
         public Column<long> last_active = new Column.Long("last_active");
         public Column<int> type_ = new Column.Integer("type");
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index f0a8953c..66362fbe 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -90,8 +90,9 @@ SOURCES
     src/ui/manage_accounts/add_account_dialog.vala
     src/ui/manage_accounts/dialog.vala
     src/ui/notifications.vala
-    src/ui/occupant_list.vala
-    src/ui/occupant_list_row.vala
+    src/ui/occupant_menu/list.vala
+    src/ui/occupant_menu/list_row.vala
+    src/ui/occupant_menu/view.vala
     src/ui/settings_dialog.vala
     src/ui/unified_window.vala
     src/ui/util.vala
diff --git a/main/data/occupant_list.ui b/main/data/occupant_list.ui
index 384d9033..d899eb5f 100644
--- a/main/data/occupant_list.ui
+++ b/main/data/occupant_list.ui
@@ -1,25 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <requires lib="gtk+" version="3.22"/>
-    <template class="DinoUiOccupantList">
+    <template class="DinoUiOccupantMenuList">
         <property name="visible">True</property>
         <child>
             <object class="GtkBox">
                 <property name="orientation">vertical</property>
                 <property name="visible">True</property>
                 <child>
-                    <object class="GtkToolbar">
-                        <property name="icon_size">1</property>
+                    <object class="GtkToolItem">
                         <property name="visible">True</property>
                         <child>
-                            <object class="GtkToolItem">
+                            <object class="GtkSearchEntry" id="search_entry">
+                                <property name="margin">8</property>
                                 <property name="visible">True</property>
-                                <child>
-                                    <object class="GtkSearchEntry" id="search_entry">
-                                        <property name="margin">5</property>
-                                        <property name="visible">True</property>
-                                    </object>
-                                </child>
                             </object>
                         </child>
                     </object>
@@ -28,7 +22,6 @@
                     <object class="GtkScrolledWindow">
                         <property name="max_content_height">500</property>
                         <property name="propagate_natural_height">True</property>
-                        <property name="margin">5</property>
                         <property name="visible">True</property>
                         <child>
                             <object class="GtkListBox" id="list_box">
diff --git a/main/data/occupant_list_item.ui b/main/data/occupant_list_item.ui
index 7a37f73b..b3689262 100644
--- a/main/data/occupant_list_item.ui
+++ b/main/data/occupant_list_item.ui
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiOccupantListRow" parent="GtkListBoxRow">
+    <template class="DinoUiOccupantMenuListRow" parent="GtkListBoxRow">
         <property name="visible">True</property>
         <child>
             <object class="GtkGrid">
                 <property name="orientation">horizontal</property>
-                <property name="margin">3</property>
+                <property name="margin-top">3</property>
+                <property name="margin-left">7</property>
+                <property name="margin-bottom">3</property>
+                <property name="margin-right">7</property>
                 <property name="column-spacing">10</property>
                 <property name="visible">True</property>
                 <child>
diff --git a/main/src/ui/conversation_titlebar.vala b/main/src/ui/conversation_titlebar.vala
index 45c4c9c1..70a376f1 100644
--- a/main/src/ui/conversation_titlebar.vala
+++ b/main/src/ui/conversation_titlebar.vala
@@ -61,11 +61,8 @@ public class ConversationTitlebar : Gtk.HeaderBar {
         groupchat_button.visible = conversation.type_ == Conversation.Type.GROUPCHAT;
         if (conversation.type_ == Conversation.Type.GROUPCHAT) {
             groupchat_button.set_use_popover(true);
-            Popover popover = new Popover(null);
-            OccupantList occupant_list = new OccupantList(stream_interactor, conversation);
-            popover.add(occupant_list);
-            occupant_list.show_all();
-            groupchat_button.set_popover(popover);
+            OccupantMenu.View menu = new OccupantMenu.View(stream_interactor, conversation);
+            groupchat_button.set_popover(menu);
         }
     }
 
diff --git a/main/src/ui/occupant_list.vala b/main/src/ui/occupant_menu/list.vala
similarity index 81%
rename from main/src/ui/occupant_list.vala
rename to main/src/ui/occupant_menu/list.vala
index 309289fc..1e96ece4 100644
--- a/main/src/ui/occupant_list.vala
+++ b/main/src/ui/occupant_menu/list.vala
@@ -3,22 +3,22 @@ using Gtk;
 
 using Dino.Entities;
 
-namespace Dino.Ui{
+namespace Dino.Ui.OccupantMenu{
 
 [GtkTemplate (ui = "/org/dino-im/occupant_list.ui")]
-public class OccupantList : Box {
+public class List : Box {
 
     public signal void conversation_selected(Conversation? conversation);
     private StreamInteractor stream_interactor;
 
-    [GtkChild] private ListBox list_box;
+    [GtkChild] public ListBox list_box;
     [GtkChild] private SearchEntry search_entry;
 
     private Conversation? conversation;
     private string[]? filter_values;
-    private HashMap<Jid, OccupantListRow> rows = new HashMap<Jid, OccupantListRow>(Jid.hash_func, Jid.equals_func);
+    private HashMap<Jid, ListRow> rows = new HashMap<Jid, ListRow>(Jid.hash_func, Jid.equals_func);
 
-    public OccupantList(StreamInteractor stream_interactor, Conversation conversation) {
+    public List(StreamInteractor stream_interactor, Conversation conversation) {
         this.stream_interactor = stream_interactor;
         list_box.set_header_func(header);
         list_box.set_sort_func(sort);
@@ -57,7 +57,7 @@ public class OccupantList : Box {
     }
 
     public void add_occupant(Jid jid) {
-        rows[jid] = new OccupantListRow(stream_interactor, conversation.account, jid);
+        rows[jid] = new ListRow(stream_interactor, conversation.account, jid);
         list_box.add(rows[jid]);
         list_box.invalidate_filter();
         list_box.invalidate_sort();
@@ -89,8 +89,8 @@ public class OccupantList : Box {
     }
 
     private bool filter(ListBoxRow r) {
-        if (r.get_type().is_a(typeof(OccupantListRow))) {
-            OccupantListRow row = r as OccupantListRow;
+        if (r.get_type().is_a(typeof(ListRow))) {
+            ListRow row = r as ListRow;
             foreach (string filter in filter_values) {
                 return row.name_label.label.down().contains(filter.down());
             }
@@ -99,9 +99,9 @@ public class OccupantList : Box {
     }
 
     private int sort(ListBoxRow row1, ListBoxRow row2) {
-        if (row1.get_type().is_a(typeof(OccupantListRow)) && row2.get_type().is_a(typeof(OccupantListRow))) {
-            OccupantListRow c1 = row1 as OccupantListRow;
-            OccupantListRow c2 = row2 as OccupantListRow;
+        if (row1.get_type().is_a(typeof(ListRow)) && row2.get_type().is_a(typeof(ListRow))) {
+            ListRow c1 = row1 as ListRow;
+            ListRow c2 = row2 as ListRow;
             return c1.name_label.label.collate(c2.name_label.label);
         }
         return 0;
diff --git a/main/src/ui/occupant_list_row.vala b/main/src/ui/occupant_menu/list_row.vala
similarity index 65%
rename from main/src/ui/occupant_list_row.vala
rename to main/src/ui/occupant_menu/list_row.vala
index 4dc7c0c5..b8b95758 100644
--- a/main/src/ui/occupant_list_row.vala
+++ b/main/src/ui/occupant_menu/list_row.vala
@@ -3,18 +3,23 @@ using Gtk;
 using Dino.Entities;
 using Xmpp;
 
-namespace Dino.Ui {
+namespace Dino.Ui.OccupantMenu {
 
 [GtkTemplate (ui = "/org/dino-im/occupant_list_item.ui")]
-public class OccupantListRow : ListBoxRow {
+public class ListRow : ListBoxRow {
 
     [GtkChild] private Image image;
     [GtkChild] public Label name_label;
 
-    public OccupantListRow(StreamInteractor stream_interactor, Account account, Jid jid) {
+    public Account account;
+    public Jid jid;
+
+    public ListRow(StreamInteractor stream_interactor, Account account, Jid jid) {
+        this.account = account;
+        this.jid = jid;
+
         name_label.label = Util.get_display_name(stream_interactor, jid, account);
         Util.image_set_from_scaled_pixbuf(image, (new AvatarGenerator(30, 30, image.scale_factor)).draw_jid(stream_interactor, jid, account));
-        //has_tooltip = true;
     }
 
     public void on_presence_received(Presence.Stanza presence) {
diff --git a/main/src/ui/occupant_menu/view.vala b/main/src/ui/occupant_menu/view.vala
new file mode 100644
index 00000000..b7fe15ba
--- /dev/null
+++ b/main/src/ui/occupant_menu/view.vala
@@ -0,0 +1,79 @@
+using Gtk;
+
+using Dino.Entities;
+
+namespace Dino.Ui.OccupantMenu {
+public class View : Popover {
+
+    private StreamInteractor stream_interactor;
+    private Conversation conversation;
+
+    private Stack stack = new Stack() { vhomogeneous=false, visible=true };
+    private List list;
+    private Label header_label = new Label("") { xalign=0.5f, hexpand=true, visible=true };
+
+    public View(StreamInteractor stream_interactor, Conversation conversation) {
+        this.stream_interactor = stream_interactor;
+        this.conversation = conversation;
+
+        list = new List(stream_interactor, conversation) { visible=true };
+        stack.add_named(list, "list");
+        setup_menu();
+        add(stack);
+        stack.visible_child_name = "list";
+
+        list.list_box.row_activated.connect((row) => {
+            ListRow list_row = row as ListRow;
+            header_label.label = list_row.name_label.label;
+            show_menu();
+        });
+
+        hide.connect(reset);
+    }
+
+    public void reset() {
+        stack.transition_type = StackTransitionType.NONE;
+        stack.visible_child_name = "list";
+        list.list_box.unselect_all();
+    }
+
+    private void setup_menu() {
+        Box header_box = new Box(Orientation.HORIZONTAL, 5) { visible=true };
+        header_box.add(new Image.from_icon_name("pan-start-symbolic", IconSize.SMALL_TOOLBAR) { visible=true });
+        header_box.add(header_label);
+
+        Button header_button = new Button() { relief=ReliefStyle.NONE, visible=true };
+        header_button.add(header_box);
+
+        ModelButton private_button = new ModelButton()  { active=true, text="Start private conversation", visible=true };
+
+        Box outer_box = new Box(Orientation.VERTICAL, 5) { margin=10, visible=true };
+        outer_box.add(header_button);
+        outer_box.add(private_button);
+        stack.add_named(outer_box, "menu");
+
+        header_button.clicked.connect(show_list);
+        private_button.clicked.connect(private_conversation_button_clicked);
+    }
+
+    private void show_list() {
+        list.list_box.unselect_all();
+        stack.transition_type = StackTransitionType.SLIDE_RIGHT;
+        stack.visible_child_name = "list";
+    }
+
+    private void show_menu() {
+        stack.transition_type = StackTransitionType.SLIDE_LEFT;
+        stack.visible_child_name = "menu";
+    }
+
+    private void private_conversation_button_clicked() {
+        ListRow? list_row = list.list_box.get_selected_row() as ListRow;
+        if (list_row == null) return;
+
+        Conversation conversation = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(list_row.jid, list_row.account, Conversation.Type.GROUPCHAT_PM);
+        stream_interactor.get_module(ConversationManager.IDENTITY).start_conversation(conversation, true);
+    }
+}
+
+}
\ No newline at end of file
diff --git a/qlite/src/table.vala b/qlite/src/table.vala
index 357e18d4..2a80c9a5 100644
--- a/qlite/src/table.vala
+++ b/qlite/src/table.vala
@@ -90,7 +90,7 @@ public class Table {
     public void add_columns_for_version(long old_version, long new_version) throws DatabaseError {
         ensure_init();
         foreach (Column c in columns) {
-            if (c.min_version <= new_version && c.max_version >= new_version && c.min_version > old_version && c.max_version < old_version) {
+            if (c.min_version <= new_version && c.max_version >= new_version && c.min_version > old_version) {
                 db.exec(@"ALTER TABLE $name ADD COLUMN $c");
             }
         }