anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use Window instead of ApplicationWindow for main view

Browse source
This commit is contained in:
fiaxh 2017-03-03 19:22:45 +01:00
parent 56bc45ce4d
commit a9ae79878e
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,5 +1,5 @@
#Dino #Dino
![screenshots](http://i.imgur.com/n9caTuJ.png) ![screenshots](http://i.imgur.com/JSHwxNf.png)
##Build ##Build
./configure ./configure

4
client/data/menu_add.ui
View file

@ -2,13 +2,13 @@
<menu id="menu_add"> <menu id="menu_add">
<section> <section>
<item> <item>
<attribute name="action">win.add_chat</attribute> <attribute name="action">app.add_chat</attribute>
<attribute name="label" translatable="yes">Start Chat</attribute> <attribute name="label" translatable="yes">Start Chat</attribute>
</item> </item>
</section> </section>
<section> <section>
<item> <item>
<attribute name="action">win.add_conference</attribute> <attribute name="action">app.add_conference</attribute>
<attribute name="label" translatable="yes">Join Conference</attribute> <attribute name="label" translatable="yes">Join Conference</attribute>
</item> </item>
</section> </section>

2
client/src/service/presence_manager.vala
View file

@ -42,7 +42,7 @@ public class PresenceManager : StreamInteractionModule, Object {
public ArrayList<Jid>? get_full_jids(Jid jid, Account account) { public ArrayList<Jid>? get_full_jids(Jid jid, Account account) {
Core.XmppStream? stream = stream_interactor.get_stream(account); Core.XmppStream? stream = stream_interactor.get_stream(account);
if (stream != null) { if (stream != null) {
ArrayList<string> resources = Xmpp.Presence.Flag.get_flag(stream).get_resources(jid.bare_jid.to_string()); Gee.List<string> resources = Xmpp.Presence.Flag.get_flag(stream).get_resources(jid.bare_jid.to_string());
if (resources == null) { if (resources == null) {
return null; return null;
} }

8
client/src/ui/conversation_list_titlebar.vala
View file

@ -15,12 +15,12 @@ public class Dino.Ui.ConversationListTitlebar : Gtk.HeaderBar {
private StreamInteractor stream_interactor; private StreamInteractor stream_interactor;
public ConversationListTitlebar(ApplicationWindow application, StreamInteractor stream_interactor) { public ConversationListTitlebar(Window application, StreamInteractor stream_interactor) {
this.stream_interactor = stream_interactor; this.stream_interactor = stream_interactor;
create_add_menu(application); create_add_menu(application);
} }
private void create_add_menu(ApplicationWindow application) { private void create_add_menu(Window window) {
SimpleAction contacts_action = new SimpleAction("add_chat", null); SimpleAction contacts_action = new SimpleAction("add_chat", null);
contacts_action.activate.connect(() => { contacts_action.activate.connect(() => {
AddConversation.Chat.Dialog add_chat_dialog = new AddConversation.Chat.Dialog(stream_interactor); AddConversation.Chat.Dialog add_chat_dialog = new AddConversation.Chat.Dialog(stream_interactor);
@ -28,7 +28,7 @@ public class Dino.Ui.ConversationListTitlebar : Gtk.HeaderBar {
add_chat_dialog.conversation_opened.connect((conversation) => conversation_opened(conversation)); add_chat_dialog.conversation_opened.connect((conversation) => conversation_opened(conversation));
add_chat_dialog.show(); add_chat_dialog.show();
}); });
application.add_action(contacts_action); window.get_application().add_action(contacts_action);
SimpleAction conference_action = new SimpleAction("add_conference", null); SimpleAction conference_action = new SimpleAction("add_conference", null);
conference_action.activate.connect(() => { conference_action.activate.connect(() => {
@ -37,7 +37,7 @@ public class Dino.Ui.ConversationListTitlebar : Gtk.HeaderBar {
add_conference_dialog.conversation_opened.connect((conversation) => conversation_opened(conversation)); add_conference_dialog.conversation_opened.connect((conversation) => conversation_opened(conversation));
add_conference_dialog.show(); add_conference_dialog.show();
}); });
application.add_action(conference_action); window.get_application().add_action(conference_action);
Builder builder = new Builder.from_resource("/org/dino-im/menu_add.ui"); Builder builder = new Builder.from_resource("/org/dino-im/menu_add.ui");
MenuModel menu = builder.get_object("menu_add") as MenuModel; MenuModel menu = builder.get_object("menu_add") as MenuModel;

2
client/src/ui/unified_window.vala
View file

@ -2,7 +2,7 @@ using Gtk;
using Dino.Entities; using Dino.Entities;
public class Dino.Ui.UnifiedWindow : ApplicationWindow { public class Dino.Ui.UnifiedWindow : Window {
public ChatInput chat_input; public ChatInput chat_input;
public ConversationListTitlebar conversation_list_titlebar; public ConversationListTitlebar conversation_list_titlebar;
public ConversationSelector.View filterable_conversation_list; public ConversationSelector.View filterable_conversation_list;

6
vala-xmpp/src/module/presence/flag.vala
View file

@ -7,14 +7,14 @@ namespace Xmpp.Presence {
public class Flag : XmppStreamFlag { public class Flag : XmppStreamFlag {
public const string ID = "presence"; public const string ID = "presence";
private HashMap<string, ArrayList<string>> resources = new HashMap<string, ArrayList<string>>(); private HashMap<string, ConcurrentList<string>> resources = new HashMap<string, ConcurrentList<string>>();
private HashMap<string, Presence.Stanza> presences = new HashMap<string, Presence.Stanza>(); private HashMap<string, Presence.Stanza> presences = new HashMap<string, Presence.Stanza>();
public Set<string> get_available_jids() { public Set<string> get_available_jids() {
return resources.keys; return resources.keys;
} }
public ArrayList<string>? get_resources(string bare_jid) { public Gee.List<string>? get_resources(string bare_jid) {
return resources[bare_jid]; return resources[bare_jid];
} }
@ -25,7 +25,7 @@ public class Flag : XmppStreamFlag {
public void add_presence(Presence.Stanza presence) { public void add_presence(Presence.Stanza presence) {
string bare_jid = get_bare_jid(presence.from); string bare_jid = get_bare_jid(presence.from);
if (!resources.has_key(bare_jid)) { if (!resources.has_key(bare_jid)) {
resources[bare_jid] = new ArrayList<string>(); resources[bare_jid] = new ConcurrentList<string>();
} }
if (resources[bare_jid].contains(presence.from)) { if (resources[bare_jid].contains(presence.from)) {
resources[bare_jid].remove(presence.from); resources[bare_jid].remove(presence.from);