Permalink
Browse files

Rename resources to have a reverse DNS prefix

  • Loading branch information...
fiaxh committed Dec 3, 2017
1 parent cfc156b commit cee39b0117c1620d852d50c14ca6f06db4e2956b
Showing with 34 additions and 34 deletions.
  1. +1 −1 libdino/src/entity/message.vala
  2. +1 −1 main/CMakeLists.txt
  3. +1 −1 main/src/ui/add_conversation/add_contact_dialog.vala
  4. +1 −1 main/src/ui/add_conversation/add_groupchat_dialog.vala
  5. +1 −1 main/src/ui/add_conversation/conference_details_fragment.vala
  6. +1 −1 main/src/ui/add_conversation/list_row.vala
  7. +1 −1 main/src/ui/add_conversation/select_jid_fragment.vala
  8. +2 −2 main/src/ui/application.vala
  9. +1 −1 main/src/ui/chat_input/encryption_button.vala
  10. +1 −1 main/src/ui/chat_input/view.vala
  11. +1 −1 main/src/ui/contact_details/dialog.vala
  12. +2 −2 main/src/ui/conversation_list_titlebar.vala
  13. +1 −1 main/src/ui/conversation_selector/chat_row.vala
  14. +1 −1 main/src/ui/conversation_selector/conversation_row.vala
  15. +1 −1 main/src/ui/conversation_selector/groupchat_pm_row.vala
  16. +1 −1 main/src/ui/conversation_selector/view.vala
  17. +1 −1 main/src/ui/conversation_summary/conversation_item_skeleton.vala
  18. +1 −1 main/src/ui/conversation_summary/conversation_view.vala
  19. +1 −1 main/src/ui/conversation_summary/file_populator.vala
  20. +1 −1 main/src/ui/conversation_titlebar/menu_entry.vala
  21. +1 −1 main/src/ui/manage_accounts/account_row.vala
  22. +1 −1 main/src/ui/manage_accounts/add_account_dialog.vala
  23. +1 −1 main/src/ui/manage_accounts/dialog.vala
  24. +1 −1 main/src/ui/occupant_menu/list.vala
  25. +1 −1 main/src/ui/occupant_menu/list_row.vala
  26. +1 −1 main/src/ui/settings_dialog.vala
  27. +1 −1 main/src/ui/unified_window.vala
  28. +2 −2 plugins/omemo/CMakeLists.txt
  29. +1 −1 plugins/omemo/src/account_settings_dialog.vala
  30. +1 −1 plugins/openpgp/CMakeLists.txt
  31. +1 −1 plugins/openpgp/src/account_settings_widget.vala
@@ -47,7 +47,7 @@ public class Message : Object {
public Marked marked {
get { return marked_; }
set {
if (marked == Marked.RECEIVED && value == Marked.READ) return;
if (value == Marked.RECEIVED && marked == Marked.READ) return;
marked_ = value;
}
}
View
@@ -55,7 +55,7 @@ compile_gresources(
TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
TYPE EMBED_C
RESOURCES ${RESOURCE_LIST}
PREFIX /im/dino
PREFIX /im/dino/Dino
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
)
@@ -5,7 +5,7 @@ using Dino.Entities;
namespace Dino.Ui {
[GtkTemplate (ui = "/im/dino/add_conversation/add_contact_dialog.ui")]
[GtkTemplate (ui = "/im/dino/Dino/add_conversation/add_contact_dialog.ui")]
protected class AddContactDialog : Gtk.Dialog {
public Account? account {
@@ -5,7 +5,7 @@ using Dino.Entities;
namespace Dino.Ui {
[GtkTemplate (ui = "/im/dino/add_conversation/add_groupchat_dialog.ui")]
[GtkTemplate (ui = "/im/dino/Dino/add_conversation/add_groupchat_dialog.ui")]
protected class AddGroupchatDialog : Gtk.Dialog {
[GtkChild] private Stack accounts_stack;
@@ -5,7 +5,7 @@ using Dino.Entities;
namespace Dino.Ui {
[GtkTemplate (ui = "/im/dino/add_conversation/conference_details_fragment.ui")]
[GtkTemplate (ui = "/im/dino/Dino/add_conversation/conference_details_fragment.ui")]
protected class ConferenceDetailsFragment : Box {
public bool done {
@@ -5,7 +5,7 @@ using Dino.Entities;
namespace Dino.Ui {
[GtkTemplate (ui = "/im/dino/add_conversation/list_row.ui")]
[GtkTemplate (ui = "/im/dino/Dino/add_conversation/list_row.ui")]
public class ListRow : ListBoxRow {
[GtkChild] public Image image;
@@ -5,7 +5,7 @@ using Dino.Entities;
namespace Dino.Ui {
[GtkTemplate (ui = "/im/dino/add_conversation/select_jid_fragment.ui")]
[GtkTemplate (ui = "/im/dino/Dino/add_conversation/select_jid_fragment.ui")]
public class SelectJidFragment : Gtk.Box {
public signal void add_jid();
@@ -20,7 +20,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
Window.set_default_icon_name("im.dino.Dino");
CssProvider provider = new CssProvider();
provider.load_from_resource("/im/dino/theme.css");
provider.load_from_resource("/im/dino/Dino/theme.css");
StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, STYLE_PROVIDER_PRIORITY_APPLICATION);
activate.connect(() => {
@@ -104,7 +104,7 @@ public class Dino.Ui.Application : Gtk.Application, Dino.Application {
add_action(quit_action);
set_accels_for_action("app.quit", new string[]{"<Ctrl>Q"});
Builder builder = new Builder.from_resource("/im/dino/menu_app.ui");
Builder builder = new Builder.from_resource("/im/dino/Dino/menu_app.ui");
MenuModel menu = builder.get_object("menu_app") as MenuModel;
set_app_menu(menu);
@@ -17,7 +17,7 @@ public class EncryptionButton : MenuButton {
image = new Image.from_icon_name("changes-allow-symbolic", IconSize.BUTTON);
get_style_context().add_class("flat");
Builder builder = new Builder.from_resource("/im/dino/menu_encryption.ui");
Builder builder = new Builder.from_resource("/im/dino/Dino/menu_encryption.ui");
popover = 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;
@@ -7,7 +7,7 @@ using Xmpp;
namespace Dino.Ui.ChatInput {
[GtkTemplate (ui = "/im/dino/chat_input.ui")]
[GtkTemplate (ui = "/im/dino/Dino/chat_input.ui")]
public class View : Box {
[GtkChild] private ScrolledWindow scrolled;
@@ -7,7 +7,7 @@ using Dino.Entities;
namespace Dino.Ui.ContactDetails {
[GtkTemplate (ui = "/im/dino/contact_details_dialog.ui")]
[GtkTemplate (ui = "/im/dino/Dino/contact_details_dialog.ui")]
public class Dialog : Gtk.Dialog {
[GtkChild] public Image avatar;
@@ -4,7 +4,7 @@ using Dino.Entities;
namespace Dino.Ui {
[GtkTemplate (ui = "/im/dino/conversation_list_titlebar.ui")]
[GtkTemplate (ui = "/im/dino/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("/im/dino/menu_add.ui");
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);
}
@@ -34,7 +34,7 @@ public class ChatRow : ConversationRow {
}
private Widget generate_tooltip() {
Builder builder = new Builder.from_resource("/im/dino/conversation_selector/chat_row_tooltip.ui");
Builder builder = new Builder.from_resource("/im/dino/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;
@@ -7,7 +7,7 @@ using Dino.Entities;
namespace Dino.Ui.ConversationSelector {
[GtkTemplate (ui = "/im/dino/conversation_selector/conversation_row.ui")]
[GtkTemplate (ui = "/im/dino/Dino/conversation_selector/conversation_row.ui")]
public abstract class ConversationRow : ListBoxRow {
public signal void closed();
@@ -29,7 +29,7 @@ public class GroupchatPmRow : ConversationRow {
}
private Widget generate_tooltip() {
Builder builder = new Builder.from_resource("/im/dino/conversation_selector/chat_row_tooltip.ui");
Builder builder = new Builder.from_resource("/im/dino/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;
@@ -6,7 +6,7 @@ using Dino.Entities;
namespace Dino.Ui.ConversationSelector {
[GtkTemplate (ui = "/im/dino/conversation_selector/view.ui")]
[GtkTemplate (ui = "/im/dino/Dino/conversation_selector/view.ui")]
public class View : Box {
public List conversation_list;
@@ -7,7 +7,7 @@ using Dino.Entities;
namespace Dino.Ui.ConversationSummary {
[GtkTemplate (ui = "/im/dino/conversation_summary/message_item.ui")]
[GtkTemplate (ui = "/im/dino/Dino/conversation_summary/message_item.ui")]
public class ConversationItemSkeleton : Grid {
[GtkChild] private Image image;
@@ -6,7 +6,7 @@ using Dino.Entities;
namespace Dino.Ui.ConversationSummary {
[GtkTemplate (ui = "/im/dino/conversation_summary/view.ui")]
[GtkTemplate (ui = "/im/dino/Dino/conversation_summary/view.ui")]
public class ConversationView : Box, Plugins.ConversationItemCollection {
public Conversation? conversation { get; private set; }
@@ -100,7 +100,7 @@ public class ImageItem : Plugins.MetaConversationItem {
Util.image_set_from_scaled_pixbuf(image, pixbuf);
Util.force_css(image, "* { box-shadow: 0px 0px 2px 0px rgba(0,0,0,0.1); margin: 2px; border-radius: 3px; }");
Builder builder = new Builder.from_resource("/im/dino/conversation_summary/image_toolbar.ui");
Builder builder = new Builder.from_resource("/im/dino/Dino/conversation_summary/image_toolbar.ui");
Widget toolbar = builder.get_object("main") as Widget;
Util.force_background(toolbar, "rgba(0, 0, 0, 0.5)");
Util.force_css(toolbar, "* { padding: 3px; border-radius: 3px; }");
@@ -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("/im/dino/menu_conversation.ui");
Builder builder = new Builder.from_resource("/im/dino/Dino/menu_conversation.ui");
MenuModel menu = builder.get_object("menu_conversation") as MenuModel;
set_menu_model(menu);
@@ -4,7 +4,7 @@ using Dino.Entities;
namespace Dino.Ui.ManageAccounts {
[GtkTemplate (ui = "/im/dino/manage_accounts/account_row.ui")]
[GtkTemplate (ui = "/im/dino/Dino/manage_accounts/account_row.ui")]
public class AccountRow : Gtk.ListBoxRow {
[GtkChild] public Image image;
@@ -5,7 +5,7 @@ using Dino.Entities;
namespace Dino.Ui.ManageAccounts {
[GtkTemplate (ui = "/im/dino/manage_accounts/add_account_dialog.ui")]
[GtkTemplate (ui = "/im/dino/Dino/manage_accounts/add_account_dialog.ui")]
public class AddAccountDialog : Gtk.Dialog {
public signal void added(Account account);
@@ -7,7 +7,7 @@ using Dino.Entities;
namespace Dino.Ui.ManageAccounts {
[GtkTemplate (ui = "/im/dino/manage_accounts/dialog.ui")]
[GtkTemplate (ui = "/im/dino/Dino/manage_accounts/dialog.ui")]
public class Dialog : Gtk.Dialog {
public signal void account_enabled(Account account);
@@ -5,7 +5,7 @@ using Dino.Entities;
namespace Dino.Ui.OccupantMenu{
[GtkTemplate (ui = "/im/dino/occupant_list.ui")]
[GtkTemplate (ui = "/im/dino/Dino/occupant_list.ui")]
public class List : Box {
public signal void conversation_selected(Conversation? conversation);
@@ -5,7 +5,7 @@ using Xmpp;
namespace Dino.Ui.OccupantMenu {
[GtkTemplate (ui = "/im/dino/occupant_list_item.ui")]
[GtkTemplate (ui = "/im/dino/Dino/occupant_list_item.ui")]
public class ListRow : ListBoxRow {
[GtkChild] private Image image;
@@ -2,7 +2,7 @@ using Gtk;
namespace Dino.Ui {
[GtkTemplate (ui = "/im/dino/settings_dialog.ui")]
[GtkTemplate (ui = "/im/dino/Dino/settings_dialog.ui")]
class SettingsDialog : Dialog {
[GtkChild] private CheckButton typing_checkbutton;
@@ -149,7 +149,7 @@ public class NoConversationsPlaceholder : UnifiedWindowPlaceholder {
}
}
[GtkTemplate (ui = "/im/dino/unified_window_placeholder.ui")]
[GtkTemplate (ui = "/im/dino/Dino/unified_window_placeholder.ui")]
public class UnifiedWindowPlaceholder : Box {
[GtkChild] public Label label;
[GtkChild] public Button primary_button;
@@ -21,7 +21,7 @@ compile_gresources(
TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
TYPE EMBED_C
RESOURCES ${RESOURCE_LIST}
PREFIX /im/dino/omemo
PREFIX /im/dino/Dino/omemo
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
)
@@ -62,4 +62,4 @@ target_link_libraries(omemo libdino signal-protocol-vala ${OMEMO_PACKAGES})
set_target_properties(omemo PROPERTIES PREFIX "")
set_target_properties(omemo PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins/)
install(TARGETS omemo ${PLUGIN_INSTALL})
install(TARGETS omemo ${PLUGIN_INSTALL})
@@ -4,7 +4,7 @@ using Dino.Entities;
namespace Dino.Plugins.Omemo {
[GtkTemplate (ui = "/im/dino/omemo/account_settings_dialog.ui")]
[GtkTemplate (ui = "/im/dino/Dino/omemo/account_settings_dialog.ui")]
public class AccountSettingsDialog : Gtk.Dialog {
private Plugin plugin;
@@ -22,7 +22,7 @@ compile_gresources(
TARGET ${CMAKE_CURRENT_BINARY_DIR}/resources/resources.c
TYPE EMBED_C
RESOURCES ${RESOURCE_LIST}
PREFIX /im/dino
PREFIX /im/dino/Dino/openpgp
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/data
)
@@ -5,7 +5,7 @@ using Dino.Entities;
namespace Dino.Plugins.OpenPgp {
[GtkTemplate (ui = "/im/dino/account_settings_item.ui")]
[GtkTemplate (ui = "/im/dino/Dino/openpgp/account_settings_item.ui")]
private class AccountSettingsWidget : Stack, Plugins.AccountSettingsWidget {
[GtkChild] private Label label;

0 comments on commit cee39b0

Please sign in to comment.