[gnome-photos] Let GtkApplication load the app menu automatically
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] Let GtkApplication load the app menu automatically
- Date: Thu, 26 Mar 2015 08:34:25 +0000 (UTC)
commit 67cbed8700f48ffd6d3618b27460d9bf85ecee35
Author: Debarshi Ray <debarshir gnome org>
Date: Wed Mar 25 09:21:13 2015 +0100
Let GtkApplication load the app menu automatically
We need to change our resource base path to /org/gnome/Photos to match
the default value computed by GIO.
https://bugzilla.gnome.org/show_bug.cgi?id=746731
src/Makefile.am | 2 +-
src/photos-application.c | 19 +------------------
src/photos-base-item.c | 2 +-
src/photos-dlna-renderers-dialog.c | 2 +-
src/photos-main-toolbar.c | 6 +++---
src/{photos-app-menu.ui => photos-menus.ui} | 0
src/photos.gresource.xml | 4 ++--
7 files changed, 9 insertions(+), 26 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d6a6b6..64115f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -249,9 +249,9 @@ EXTRA_DIST = \
photos-enums.h.template \
photos-generate-about \
photos.gresource.xml \
- photos-app-menu.ui \
photos-dlna-renderers-dialog.ui \
photos-marshalers.list \
+ photos-menus.ui \
photos-preview-menu.ui \
photos-selection-menu.ui \
photos-gom-miner.xml \
diff --git a/src/photos-application.c b/src/photos-application.c
index de62c55..3350dc6 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -305,21 +305,6 @@ photos_application_get_state (PhotosSearchContext *context)
static void
-photos_application_init_app_menu (PhotosApplication *self)
-{
- GMenu *menu;
- GtkBuilder *builder;
-
- builder = gtk_builder_new ();
- gtk_builder_add_from_resource (builder, "/org/gnome/photos/app-menu.ui", NULL);
-
- menu = G_MENU (gtk_builder_get_object (builder, "app-menu"));
- gtk_application_set_app_menu (GTK_APPLICATION (self), G_MENU_MODEL (menu));
- g_object_unref (builder);
-}
-
-
-static void
photos_application_launch_search (PhotosApplication *self, const gchar* const *terms, guint timestamp)
{
PhotosApplicationPrivate *priv = self->priv;
@@ -601,7 +586,7 @@ photos_application_theme_changed (GtkSettings *settings)
GFile *file;
provider = gtk_css_provider_new ();
- file = g_file_new_for_uri ("resource:///org/gnome/photos/Adwaita.css");
+ file = g_file_new_for_uri ("resource:///org/gnome/Photos/Adwaita.css");
gtk_css_provider_load_from_file (provider, file, NULL);
g_object_unref (file);
}
@@ -984,8 +969,6 @@ photos_application_startup (GApplication *application)
G_CALLBACK (photos_application_window_mode_changed),
self);
- photos_application_init_app_menu (self);
-
action = g_simple_action_new ("help", NULL);
g_signal_connect_swapped (action, "activate", G_CALLBACK (photos_application_help), self);
g_action_map_add_action (G_ACTION_MAP (self), G_ACTION (action));
diff --git a/src/photos-base-item.c b/src/photos-base-item.c
index 3b5a4eb..80a5aff 100644
--- a/src/photos-base-item.c
+++ b/src/photos-base-item.c
@@ -283,7 +283,7 @@ photos_base_item_check_effects_and_update_info (PhotosBaseItem *self)
slice = photos_utils_get_thumbnail_frame_border ();
thumbnailed_pixbuf = gd_embed_image_in_frame (emblemed_pixbuf,
- "resource:///org/gnome/photos/thumbnail-frame.png",
+ "resource:///org/gnome/Photos/thumbnail-frame.png",
slice,
slice);
gtk_border_free (slice);
diff --git a/src/photos-dlna-renderers-dialog.c b/src/photos-dlna-renderers-dialog.c
index 767332c..7498c5c 100644
--- a/src/photos-dlna-renderers-dialog.c
+++ b/src/photos-dlna-renderers-dialog.c
@@ -271,7 +271,7 @@ photos_dlna_renderers_dialog_class_init (PhotosDlnaRenderersDialogClass *class)
NULL,
G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE));
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/photos/dlna-renderers-dialog.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Photos/dlna-renderers-dialog.ui");
gtk_widget_class_bind_template_child_private (widget_class, PhotosDlnaRenderersDialog, listbox);
gtk_widget_class_bind_template_callback (widget_class, photos_dlna_renderers_dialog_row_activated_cb);
diff --git a/src/photos-main-toolbar.c b/src/photos-main-toolbar.c
index 2e93736..9495fff 100644
--- a/src/photos-main-toolbar.c
+++ b/src/photos-main-toolbar.c
@@ -1,6 +1,6 @@
/*
* Photos - access, organize and share your photos on GNOME
- * Copyright © 2012, 2013, 2014 Red Hat, Inc.
+ * Copyright © 2012, 2013, 2014, 2015 Red Hat, Inc.
* Copyright © 2014 Saurav Agarwalla
*
* This program is free software; you can redistribute it and/or
@@ -403,7 +403,7 @@ photos_main_toolbar_create_preview_menu (PhotosMainToolbar *self)
PhotosBaseItem *item;
builder = gtk_builder_new ();
- gtk_builder_add_from_resource (builder, "/org/gnome/photos/preview-menu.ui", NULL);
+ gtk_builder_add_from_resource (builder, "/org/gnome/Photos/preview-menu.ui", NULL);
menu = G_MENU (g_object_ref (gtk_builder_get_object (builder, "preview-menu")));
item = PHOTOS_BASE_ITEM (photos_base_manager_get_active_object (self->priv->item_mngr));
@@ -762,7 +762,7 @@ photos_main_toolbar_init (PhotosMainToolbar *self)
priv->search = g_action_map_lookup_action (G_ACTION_MAP (app), "search");
builder = gtk_builder_new ();
- gtk_builder_add_from_resource (builder, "/org/gnome/photos/selection-menu.ui", NULL);
+ gtk_builder_add_from_resource (builder, "/org/gnome/Photos/selection-menu.ui", NULL);
selection_menu = G_MENU (gtk_builder_get_object (builder, "selection-menu"));
priv->selection_menu = gtk_menu_button_new ();
diff --git a/src/photos-app-menu.ui b/src/photos-menus.ui
similarity index 100%
rename from src/photos-app-menu.ui
rename to src/photos-menus.ui
diff --git a/src/photos.gresource.xml b/src/photos.gresource.xml
index 6f8a496..20b58a2 100644
--- a/src/photos.gresource.xml
+++ b/src/photos.gresource.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
- <gresource prefix="/org/gnome/photos">
+ <gresource prefix="/org/gnome/Photos">
+ <file alias="gtk/menus.ui" preprocess="xml-stripblanks" compressed="true">photos-menus.ui</file>
<file alias="Adwaita.css">../data/Adwaita.css</file>
- <file alias="app-menu.ui" preprocess="xml-stripblanks" compressed="true">photos-app-menu.ui</file>
<file alias="dlna-renderers-dialog.ui" preprocess="xml-stripblanks"
compressed="true">photos-dlna-renderers-dialog.ui</file>
<file alias="dnd-counter.svg" preprocess="to-pixdata">../data/dnd-counter.svg</file>
<file alias="preview-menu.ui" preprocess="xml-stripblanks"
compressed="true">photos-preview-menu.ui</file>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]