diff options
Diffstat (limited to 'main/src')
25 files changed, 40 insertions, 41 deletions
diff --git a/main/src/ui/add_conversation/chat/add_contact_dialog.vala b/main/src/ui/add_conversation/chat/add_contact_dialog.vala index f07f9659..9c14883a 100644 --- a/main/src/ui/add_conversation/chat/add_contact_dialog.vala +++ b/main/src/ui/add_conversation/chat/add_contact_dialog.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.AddConversation.Chat { -[GtkTemplate (ui = "/org/dino-im/add_conversation/add_contact_dialog.ui")] +[GtkTemplate (ui = "/im/dino/add_conversation/add_contact_dialog.ui")] protected class AddContactDialog : Gtk.Dialog { public Account? account { @@ -55,4 +55,4 @@ protected class AddContactDialog : Gtk.Dialog { } } -}
\ No newline at end of file +} diff --git a/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala b/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala index 602fe63f..dc0cfd6d 100644 --- a/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala +++ b/main/src/ui/add_conversation/conference/add_groupchat_dialog.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.AddConversation.Conference { -[GtkTemplate (ui = "/org/dino-im/add_conversation/add_groupchat_dialog.ui")] +[GtkTemplate (ui = "/im/dino/add_conversation/add_groupchat_dialog.ui")] protected class AddGroupchatDialog : Gtk.Dialog { [GtkChild] private Stack accounts_stack; diff --git a/main/src/ui/add_conversation/conference/conference_details_fragment.vala b/main/src/ui/add_conversation/conference/conference_details_fragment.vala index dcb69cff..d99681a1 100644 --- a/main/src/ui/add_conversation/conference/conference_details_fragment.vala +++ b/main/src/ui/add_conversation/conference/conference_details_fragment.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.AddConversation.Conference { -[GtkTemplate (ui = "/org/dino-im/add_conversation/conference_details_fragment.ui")] +[GtkTemplate (ui = "/im/dino/add_conversation/conference_details_fragment.ui")] protected class ConferenceDetailsFragment : Box { public bool done { @@ -140,4 +140,4 @@ protected class ConferenceDetailsFragment : Box { } -}
\ No newline at end of file +} diff --git a/main/src/ui/add_conversation/list_row.vala b/main/src/ui/add_conversation/list_row.vala index c68fde7b..5b600786 100644 --- a/main/src/ui/add_conversation/list_row.vala +++ b/main/src/ui/add_conversation/list_row.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.AddConversation { -[GtkTemplate (ui = "/org/dino-im/add_conversation/list_row.ui")] +[GtkTemplate (ui = "/im/dino/add_conversation/list_row.ui")] public class ListRow : ListBoxRow { [GtkChild] public Image image; @@ -36,4 +36,4 @@ public class ListRow : ListBoxRow { } } -}
\ No newline at end of file +} diff --git a/main/src/ui/add_conversation/select_jid_fragment.vala b/main/src/ui/add_conversation/select_jid_fragment.vala index 9e0c4067..98ceb2fa 100644 --- a/main/src/ui/add_conversation/select_jid_fragment.vala +++ b/main/src/ui/add_conversation/select_jid_fragment.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.AddConversation { -[GtkTemplate (ui = "/org/dino-im/add_conversation/select_jid_fragment.ui")] +[GtkTemplate (ui = "/im/dino/add_conversation/select_jid_fragment.ui")] public class SelectJidFragment : Gtk.Box { public signal void add_jid(); diff --git a/main/src/ui/application.vala b/main/src/ui/application.vala index 75b82352..f91e951d 100644 --- a/main/src/ui/application.vala +++ b/main/src/ui/application.vala @@ -17,7 +17,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application { Notify.init("dino"); Environment.set_application_name("Dino"); Gtk.Window.set_default_icon_name("dino"); - IconTheme.get_default().add_resource_path("/org/dino-im/icons"); + IconTheme.get_default().add_resource_path("/im/dino/icons"); activate.connect(() => { create_set_app_menu(); @@ -57,7 +57,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application { add_action(quit_action); add_accelerator("<Ctrl>Q", "app.quit", null); - Builder builder = new Builder.from_resource("/org/dino-im/menu_app.ui"); + Builder builder = new Builder.from_resource("/im/dino/menu_app.ui"); MenuModel menu = builder.get_object("menu_app") as MenuModel; set_app_menu(menu); diff --git a/main/src/ui/chat_input/edit_history.vala b/main/src/ui/chat_input/edit_history.vala index 78a0f41e..22032a0b 100644 --- a/main/src/ui/chat_input/edit_history.vala +++ b/main/src/ui/chat_input/edit_history.vala @@ -30,12 +30,11 @@ class EditHistory { } public bool on_text_input_key_press(EventKey event) { - if ((event.state & ModifierType.CONTROL_MASK) > 0) { - if (event.keyval == Key.z) { - undo(); - } else if (event.keyval == Key.Z) { - redo(); - } + bool ctrl_pressed = (event.state & ModifierType.CONTROL_MASK) > 0; + if (ctrl_pressed && event.keyval == Key.z) { + undo(); + } else if (ctrl_pressed && (event.keyval in new uint[]{ Key.Z, Key.y } )) { + redo(); } else if (event.keyval in new uint[]{ Key.space, Key.Tab, Key.ISO_Left_Tab }) { if (indices[conversation] < histories[conversation].size - 1) { histories[conversation] = histories[conversation].slice(0, indices[conversation] + 1); diff --git a/main/src/ui/chat_input/view.vala b/main/src/ui/chat_input/view.vala index a7c3099c..3684e27c 100644 --- a/main/src/ui/chat_input/view.vala +++ b/main/src/ui/chat_input/view.vala @@ -7,7 +7,7 @@ using Xmpp; namespace Dino.Ui.ChatInput { -[GtkTemplate (ui = "/org/dino-im/chat_input.ui")] +[GtkTemplate (ui = "/im/dino/chat_input.ui")] public class View : Box { [GtkChild] private ScrolledWindow scrolled; diff --git a/main/src/ui/contact_details/dialog.vala b/main/src/ui/contact_details/dialog.vala index 4e61a3f5..147811f9 100644 --- a/main/src/ui/contact_details/dialog.vala +++ b/main/src/ui/contact_details/dialog.vala @@ -7,7 +7,7 @@ using Dino.Entities; namespace Dino.Ui.ContactDetails { -[GtkTemplate (ui = "/org/dino-im/contact_details_dialog.ui")] +[GtkTemplate (ui = "/im/dino/contact_details_dialog.ui")] public class Dialog : Gtk.Dialog { [GtkChild] public Image avatar; diff --git a/main/src/ui/conversation_list_titlebar.vala b/main/src/ui/conversation_list_titlebar.vala index e2d7fa26..b9a902c8 100644 --- a/main/src/ui/conversation_list_titlebar.vala +++ b/main/src/ui/conversation_list_titlebar.vala @@ -4,7 +4,7 @@ using Dino.Entities; namespace Dino.Ui { -[GtkTemplate (ui = "/org/dino-im/conversation_list_titlebar.ui")] +[GtkTemplate (ui = "/im/dino/conversation_list_titlebar.ui")] public class ConversationListTitlebar : Gtk.HeaderBar { public signal void conversation_opened(Conversation conversation); @@ -44,7 +44,7 @@ public class ConversationListTitlebar : Gtk.HeaderBar { }); GLib.Application.get_default().add_action(conference_action); - Builder builder = new Builder.from_resource("/org/dino-im/menu_add.ui"); + Builder builder = new Builder.from_resource("/im/dino/menu_add.ui"); MenuModel menu = builder.get_object("menu_add") as MenuModel; add_button.set_menu_model(menu); } diff --git a/main/src/ui/conversation_selector/chat_row.vala b/main/src/ui/conversation_selector/chat_row.vala index 83ad3a11..0a8737f1 100644 --- a/main/src/ui/conversation_selector/chat_row.vala +++ b/main/src/ui/conversation_selector/chat_row.vala @@ -47,7 +47,7 @@ public class ChatRow : ConversationRow { } private Widget generate_tooltip() { - Builder builder = new Builder.from_resource("/org/dino-im/conversation_selector/chat_row_tooltip.ui"); + Builder builder = new Builder.from_resource("/im/dino/conversation_selector/chat_row_tooltip.ui"); Box main_box = builder.get_object("main_box") as Box; Box inner_box = builder.get_object("inner_box") as Box; Label jid_label = builder.get_object("jid_label") as Label; @@ -64,4 +64,4 @@ public class ChatRow : ConversationRow { } } -}
\ No newline at end of file +} diff --git a/main/src/ui/conversation_selector/conversation_row.vala b/main/src/ui/conversation_selector/conversation_row.vala index 2aa913b5..ecad3467 100644 --- a/main/src/ui/conversation_selector/conversation_row.vala +++ b/main/src/ui/conversation_selector/conversation_row.vala @@ -8,7 +8,7 @@ using Dino.Entities; namespace Dino.Ui.ConversationSelector { -[GtkTemplate (ui = "/org/dino-im/conversation_selector/conversation_row.ui")] +[GtkTemplate (ui = "/im/dino/conversation_selector/conversation_row.ui")] public abstract class ConversationRow : ListBoxRow { public signal void closed(); diff --git a/main/src/ui/conversation_selector/groupchat_pm_row.vala b/main/src/ui/conversation_selector/groupchat_pm_row.vala index c5cbcc09..b502501d 100644 --- a/main/src/ui/conversation_selector/groupchat_pm_row.vala +++ b/main/src/ui/conversation_selector/groupchat_pm_row.vala @@ -39,7 +39,7 @@ public class GroupchatPmRow : ConversationRow { } private Widget generate_tooltip() { - Builder builder = new Builder.from_resource("/org/dino-im/conversation_selector/chat_row_tooltip.ui"); + Builder builder = new Builder.from_resource("/im/dino/conversation_selector/chat_row_tooltip.ui"); Box main_box = builder.get_object("main_box") as Box; Box inner_box = builder.get_object("inner_box") as Box; Label jid_label = builder.get_object("jid_label") as Label; @@ -51,4 +51,4 @@ public class GroupchatPmRow : ConversationRow { } } -}
\ No newline at end of file +} diff --git a/main/src/ui/conversation_selector/view.vala b/main/src/ui/conversation_selector/view.vala index 304c6bbe..3ea3148d 100644 --- a/main/src/ui/conversation_selector/view.vala +++ b/main/src/ui/conversation_selector/view.vala @@ -6,7 +6,7 @@ using Dino.Entities; namespace Dino.Ui.ConversationSelector { -[GtkTemplate (ui = "/org/dino-im/conversation_selector/view.ui")] +[GtkTemplate (ui = "/im/dino/conversation_selector/view.ui")] public class View : Box { public List conversation_list; @@ -49,4 +49,4 @@ public class View : Box { } } -}
\ No newline at end of file +} diff --git a/main/src/ui/conversation_summary/message_item.vala b/main/src/ui/conversation_summary/message_item.vala index b03202f5..f669c021 100644 --- a/main/src/ui/conversation_summary/message_item.vala +++ b/main/src/ui/conversation_summary/message_item.vala @@ -7,7 +7,7 @@ using Dino.Entities; namespace Dino.Ui.ConversationSummary { -[GtkTemplate (ui = "/org/dino-im/conversation_summary/message_item.ui")] +[GtkTemplate (ui = "/im/dino/conversation_summary/message_item.ui")] public class MessageItem : Grid, ConversationItem { [GtkChild] private Image image; diff --git a/main/src/ui/conversation_summary/view.vala b/main/src/ui/conversation_summary/view.vala index c0cf772d..5b49f97e 100644 --- a/main/src/ui/conversation_summary/view.vala +++ b/main/src/ui/conversation_summary/view.vala @@ -7,7 +7,7 @@ using Xmpp; namespace Dino.Ui.ConversationSummary { -[GtkTemplate (ui = "/org/dino-im/conversation_summary/view.ui")] +[GtkTemplate (ui = "/im/dino/conversation_summary/view.ui")] public class View : Box { public Conversation? conversation { get; private set; } diff --git a/main/src/ui/conversation_titlebar/encryption_entry.vala b/main/src/ui/conversation_titlebar/encryption_entry.vala index 12b73409..16cc5fdd 100644 --- a/main/src/ui/conversation_titlebar/encryption_entry.vala +++ b/main/src/ui/conversation_titlebar/encryption_entry.vala @@ -24,7 +24,7 @@ class EncryptionWidget : MenuButton, Plugins.ConversationTitlebarWidget { private Map<RadioButton, Plugins.EncryptionListEntry> encryption_radios = new HashMap<RadioButton, Plugins.EncryptionListEntry>(); public EncryptionWidget() { - Builder builder = new Builder.from_resource("/org/dino-im/menu_encryption.ui"); + Builder builder = new Builder.from_resource("/im/dino/menu_encryption.ui"); PopoverMenu menu = builder.get_object("menu_encryption") as PopoverMenu; Box encryption_box = builder.get_object("encryption_box") as Box; button_unencrypted = builder.get_object("button_unencrypted") as RadioButton; diff --git a/main/src/ui/conversation_titlebar/menu_entry.vala b/main/src/ui/conversation_titlebar/menu_entry.vala index 6cdd11c2..e6e5e1b4 100644 --- a/main/src/ui/conversation_titlebar/menu_entry.vala +++ b/main/src/ui/conversation_titlebar/menu_entry.vala @@ -29,7 +29,7 @@ class MenuWidget : MenuButton, Plugins.ConversationTitlebarWidget { public MenuWidget(StreamInteractor stream_interactor) { image = new Image.from_icon_name("open-menu-symbolic", IconSize.MENU); - Builder builder = new Builder.from_resource("/org/dino-im/menu_conversation.ui"); + Builder builder = new Builder.from_resource("/im/dino/menu_conversation.ui"); MenuModel menu = builder.get_object("menu_conversation") as MenuModel; set_menu_model(menu); diff --git a/main/src/ui/manage_accounts/account_row.vala b/main/src/ui/manage_accounts/account_row.vala index f08faa78..911d48f4 100644 --- a/main/src/ui/manage_accounts/account_row.vala +++ b/main/src/ui/manage_accounts/account_row.vala @@ -4,7 +4,7 @@ using Dino.Entities; namespace Dino.Ui.ManageAccounts { -[GtkTemplate (ui = "/org/dino-im/manage_accounts/account_row.ui")] +[GtkTemplate (ui = "/im/dino/manage_accounts/account_row.ui")] public class AccountRow : Gtk.ListBoxRow { [GtkChild] public Image image; @@ -40,4 +40,4 @@ public class AccountRow : Gtk.ListBoxRow { } } -}
\ No newline at end of file +} diff --git a/main/src/ui/manage_accounts/add_account_dialog.vala b/main/src/ui/manage_accounts/add_account_dialog.vala index 74754b79..5e3f3859 100644 --- a/main/src/ui/manage_accounts/add_account_dialog.vala +++ b/main/src/ui/manage_accounts/add_account_dialog.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.ManageAccounts { -[GtkTemplate (ui = "/org/dino-im/manage_accounts/add_account_dialog.ui")] +[GtkTemplate (ui = "/im/dino/manage_accounts/add_account_dialog.ui")] public class AddAccountDialog : Gtk.Dialog { public signal void added(Account account); diff --git a/main/src/ui/manage_accounts/dialog.vala b/main/src/ui/manage_accounts/dialog.vala index dae2fa73..7fc926dc 100644 --- a/main/src/ui/manage_accounts/dialog.vala +++ b/main/src/ui/manage_accounts/dialog.vala @@ -7,7 +7,7 @@ using Dino.Entities; namespace Dino.Ui.ManageAccounts { -[GtkTemplate (ui = "/org/dino-im/manage_accounts/dialog.ui")] +[GtkTemplate (ui = "/im/dino/manage_accounts/dialog.ui")] public class Dialog : Gtk.Dialog { public signal void account_enabled(Account account); diff --git a/main/src/ui/occupant_menu/list.vala b/main/src/ui/occupant_menu/list.vala index aeea7c26..3477885f 100644 --- a/main/src/ui/occupant_menu/list.vala +++ b/main/src/ui/occupant_menu/list.vala @@ -5,7 +5,7 @@ using Dino.Entities; namespace Dino.Ui.OccupantMenu{ -[GtkTemplate (ui = "/org/dino-im/occupant_list.ui")] +[GtkTemplate (ui = "/im/dino/occupant_list.ui")] public class List : Box { public signal void conversation_selected(Conversation? conversation); diff --git a/main/src/ui/occupant_menu/list_row.vala b/main/src/ui/occupant_menu/list_row.vala index f5776b4b..c7536f9c 100644 --- a/main/src/ui/occupant_menu/list_row.vala +++ b/main/src/ui/occupant_menu/list_row.vala @@ -5,7 +5,7 @@ using Xmpp; namespace Dino.Ui.OccupantMenu { -[GtkTemplate (ui = "/org/dino-im/occupant_list_item.ui")] +[GtkTemplate (ui = "/im/dino/occupant_list_item.ui")] public class ListRow : ListBoxRow { [GtkChild] private Image image; @@ -28,4 +28,4 @@ public class ListRow : ListBoxRow { } } -}
\ No newline at end of file +} diff --git a/main/src/ui/settings_dialog.vala b/main/src/ui/settings_dialog.vala index 44596217..6d4daf3b 100644 --- a/main/src/ui/settings_dialog.vala +++ b/main/src/ui/settings_dialog.vala @@ -2,7 +2,7 @@ using Gtk; namespace Dino.Ui { -[GtkTemplate (ui = "/org/dino-im/settings_dialog.ui")] +[GtkTemplate (ui = "/im/dino/settings_dialog.ui")] class SettingsDialog : Dialog { [GtkChild] private CheckButton typing_checkbutton; @@ -27,4 +27,4 @@ class SettingsDialog : Dialog { } } -}
\ No newline at end of file +} diff --git a/main/src/ui/unified_window.vala b/main/src/ui/unified_window.vala index 1ae13245..e9c1a8e6 100644 --- a/main/src/ui/unified_window.vala +++ b/main/src/ui/unified_window.vala @@ -151,7 +151,7 @@ public class NoConversationsPlaceholder : UnifiedWindowPlaceholder { } } -[GtkTemplate (ui = "/org/dino-im/unified_window_placeholder.ui")] +[GtkTemplate (ui = "/im/dino/unified_window_placeholder.ui")] public class UnifiedWindowPlaceholder : Box { [GtkChild] public Label label; [GtkChild] public Button primary_button; |