From 5a7ffbc1870aeee52fed3c457817010b608e1e52 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sun, 27 Jan 2019 15:24:58 +0100 Subject: Move app menu into window, make conversation details dialog directly accessible, no-CSD option for main window --- main/src/ui/conversation_list_titlebar.vala | 37 +++++++---------------------- 1 file changed, 9 insertions(+), 28 deletions(-) (limited to 'main/src/ui/conversation_list_titlebar.vala') diff --git a/main/src/ui/conversation_list_titlebar.vala b/main/src/ui/conversation_list_titlebar.vala index 60d9a6fb..abce2a6c 100644 --- a/main/src/ui/conversation_list_titlebar.vala +++ b/main/src/ui/conversation_list_titlebar.vala @@ -5,47 +5,28 @@ using Dino.Entities; namespace Dino.Ui { [GtkTemplate (ui = "/im/dino/Dino/conversation_list_titlebar.ui")] -public class ConversationListTitlebar : Gtk.HeaderBar { +public class ConversationListTitlebar : Gtk.Box { public signal void conversation_opened(Conversation conversation); [GtkChild] private MenuButton add_button; + [GtkChild] private MenuButton menu_button; private StreamInteractor stream_interactor; public ConversationListTitlebar(StreamInteractor stream_interactor, Window window) { this.stream_interactor = stream_interactor; - - custom_title = new Label("Dino") { visible = true, hexpand = true, xalign = 0 }; - custom_title.get_style_context().add_class("title"); - create_add_menu(window); } private void create_add_menu(Window window) { - SimpleAction contacts_action = new SimpleAction("add_chat", null); - contacts_action.activate.connect(() => { - AddChatDialog add_chat_dialog = new AddChatDialog(stream_interactor, stream_interactor.get_accounts()); - add_chat_dialog.set_transient_for(window); - add_chat_dialog.added.connect((conversation) => { - conversation_opened(conversation); - }); - add_chat_dialog.present(); - }); - GLib.Application.get_default().add_action(contacts_action); - - SimpleAction conference_action = new SimpleAction("add_conference", null); - conference_action.activate.connect(() => { - AddConferenceDialog add_conference_dialog = new AddConferenceDialog(stream_interactor); - add_conference_dialog.set_transient_for(window); - add_conference_dialog.conversation_opened.connect((conversation) => conversation_opened(conversation)); - add_conference_dialog.present(); - }); - GLib.Application.get_default().add_action(conference_action); - - Builder builder = new Builder.from_resource("/im/dino/Dino/menu_add.ui"); - MenuModel menu = builder.get_object("menu_add") as MenuModel; - add_button.set_menu_model(menu); + Builder add_builder = new Builder.from_resource("/im/dino/Dino/menu_add.ui"); + MenuModel add_menu_model = add_builder.get_object("menu_add") as MenuModel; + add_button.set_menu_model(add_menu_model); + + Builder menu_builder = new Builder.from_resource("/im/dino/Dino/menu_app.ui"); + MenuModel menu_menu_model = menu_builder.get_object("menu_app") as MenuModel; + menu_button.set_menu_model(menu_menu_model); } } -- cgit v1.2.3-70-g09d2