diff --git a/shell/Makefile.am b/shell/Makefile.am index 96075c3d..9719fa1b 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -169,6 +169,7 @@ endif EXTRA_DIST = \ evince.css \ evince-menus.ui \ + help-overlay.ui \ evince-icon.rc \ evince.gresource.xml \ ev-gdbus.xml \ diff --git a/shell/ev-application.c b/shell/ev-application.c index 2a2830ba..1466b4f3 100644 --- a/shell/ev-application.c +++ b/shell/ev-application.c @@ -1091,6 +1091,8 @@ ev_application_startup (GApplication *gapplication) GError *error = NULL; const gchar **it; + g_application_set_resource_base_path (gapplication, "/org/gnome/evince"); + G_APPLICATION_CLASS (ev_application_parent_class)->startup (gapplication); g_action_map_add_action_entries (G_ACTION_MAP (application), @@ -1098,7 +1100,7 @@ ev_application_startup (GApplication *gapplication) application); builder = gtk_builder_new (); - gtk_builder_add_from_resource (builder, "/org/gnome/evince/shell/ui/menus.ui", &error); + gtk_builder_add_from_resource (builder, "/org/gnome/evince/ui/menus.ui", &error); g_assert_no_error (error); gtk_application_set_app_menu (GTK_APPLICATION (application), diff --git a/shell/ev-toolbar.c b/shell/ev-toolbar.c index b25b04ab..64aed8e7 100644 --- a/shell/ev-toolbar.c +++ b/shell/ev-toolbar.c @@ -195,7 +195,7 @@ ev_toolbar_constructed (GObject *object) G_OBJECT_CLASS (ev_toolbar_parent_class)->constructed (object); - builder = gtk_builder_new_from_resource ("/org/gnome/evince/shell/ui/menus.ui"); + builder = gtk_builder_new_from_resource ("/org/gnome/evince/ui/menus.ui"); button = ev_toolbar_create_button (ev_toolbar, "win.open", "document-open-symbolic", diff --git a/shell/ev-window.c b/shell/ev-window.c index 462f78cf..601bb1b4 100644 --- a/shell/ev-window.c +++ b/shell/ev-window.c @@ -6782,7 +6782,7 @@ ev_window_init (EvWindow *ev_window) css_provider = gtk_css_provider_new (); _gtk_css_provider_load_from_resource (css_provider, - "/org/gnome/evince/shell/ui/evince.css", + "/org/gnome/evince/ui/evince.css", &error); g_assert_no_error (error); gtk_style_context_add_provider_for_screen (gtk_widget_get_screen (GTK_WIDGET (ev_window)), @@ -7091,7 +7091,7 @@ ev_window_init (EvWindow *ev_window) ev_window); /* Popups */ - builder = gtk_builder_new_from_resource ("/org/gnome/evince/shell/ui/menus.ui"); + builder = gtk_builder_new_from_resource ("/org/gnome/evince/ui/menus.ui"); ev_window->priv->view_popup_menu = g_object_ref (G_MENU_MODEL (gtk_builder_get_object (builder, "view-popup-menu"))); ev_window->priv->attachment_popup_menu = g_object_ref (G_MENU_MODEL (gtk_builder_get_object (builder, "attachments-popup"))); g_object_unref (builder); diff --git a/shell/evince.css b/shell/evince.css index 63afebfc..d8c46134 100644 --- a/shell/evince.css +++ b/shell/evince.css @@ -12,7 +12,7 @@ .content-view.document-page { border-style: solid; border-width: 3px 3px 6px 4px; - border-image: url("resource:///org/gnome/evince/shell/ui/thumbnail-frame.png") 3 3 6 4; + border-image: url("resource:///org/gnome/evince/ui/thumbnail-frame.png") 3 3 6 4; background-color: @theme_bg_color; } diff --git a/shell/evince.gresource.xml b/shell/evince.gresource.xml index 75bbdecf..bbacb1c0 100644 --- a/shell/evince.gresource.xml +++ b/shell/evince.gresource.xml @@ -16,7 +16,8 @@ along with this program. If not, see . --> - + + help-overlay.ui evince.css thumbnail-frame.png evince-menus.ui diff --git a/shell/help-overlay.ui b/shell/help-overlay.ui new file mode 100644 index 00000000..b8f3088c --- /dev/null +++ b/shell/help-overlay.ui @@ -0,0 +1,225 @@ + + + + True + + + True + shortcuts + 12 + + + True + Opening, closing, saving and printing + + + True + Open a document + <Primary>O + + + + + True + Open a copy of the current document + <Primary>N + + + + + True + Save a copy of the current document + <Primary>S + + + + + True + Print the current document + <Primary>P + + + + + True + Close the current document window + <Primary>W + + + + + True + Reload the document + <Primary>R + + + + + + + True + Selecting and copying text + + + True + Copy highlighted text + <Primary>C + + + + + True + Select all the text in a document + <Primary>A + + + + + + + True + Moving around the document + + + True + Move up/down a page + Left Up Down Right + + + + + True + Move up/down a page several lines at a time + Page_Up Page_Down + + + + + True + Go to page number + <Primary>L + + + + + True + Go to the beginning/end of a page + Home End + + + + + True + Go to the beginning of the document + <Primary>Home + + + + + True + Go to the end of the document + <Primary>End + + + + + + + True + Finding text + + + True + Show the search bar + <Primary>F + + + + + True + Go to the next search result + <Primary>G + + + + + True + Go to the previous search result + <Primary><shift>G + + + + + + + True + Rotating and zooming + + + True + Rotate the page 90 degrees counter-clockwise + <Primary>Left + + + + + True + Rotate the page 90 degrees clockwise + <Primary>Right + + + + + True + Zoom in + <Primary>plus + + + + + True + Zoom out + <Primary>minus + + + + + + + True + Touchpad gestures + + + True + Zoom in + gesture-pinch + + + + + True + Zoom in + gesture-stretch + + + + + True + Go to next page + gesture-two-finger-swipe-right + + + + + True + Go to previous page + gesture-two-finger-swipe-left + + + + + + + + +