From 4a3f1fdfe1eb3743564adcee35d5513224339260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 25 Nov 2016 04:10:33 +0100 Subject: New upstream version 0.25.1 --- src/tags/TagPage.c | 778 ++++++++++++++++++++--------------------------------- 1 file changed, 287 insertions(+), 491 deletions(-) (limited to 'src/tags/TagPage.c') diff --git a/src/tags/TagPage.c b/src/tags/TagPage.c index fb8b7a2..5829bfc 100644 --- a/src/tags/TagPage.c +++ b/src/tags/TagPage.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #define TYPE_PAGE (page_get_type ()) @@ -304,6 +304,16 @@ typedef struct _ConfigurationFacadeClass ConfigurationFacadeClass; typedef struct _ConfigFacade ConfigFacade; typedef struct _ConfigFacadeClass ConfigFacadeClass; +#define TYPE_APP_WINDOW (app_window_get_type ()) +#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) +#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) +#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) +#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) +#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) + +typedef struct _AppWindow AppWindow; +typedef struct _AppWindowClass AppWindowClass; + #define TYPE_COMMAND (command_get_type ()) #define COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND, Command)) #define COMMAND_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMMAND, CommandClass)) @@ -355,16 +365,6 @@ typedef struct _CommandManager CommandManager; typedef struct _CommandManagerClass CommandManagerClass; #define _command_manager_unref0(var) ((var == NULL) ? NULL : (var = (command_manager_unref (var), NULL))) -#define TYPE_APP_WINDOW (app_window_get_type ()) -#define APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_APP_WINDOW, AppWindow)) -#define APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_APP_WINDOW, AppWindowClass)) -#define IS_APP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_APP_WINDOW)) -#define IS_APP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_APP_WINDOW)) -#define APP_WINDOW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_APP_WINDOW, AppWindowClass)) - -typedef struct _AppWindow AppWindow; -typedef struct _AppWindowClass AppWindowClass; - #define TYPE_LIBRARY_WINDOW (library_window_get_type ()) #define LIBRARY_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_LIBRARY_WINDOW, LibraryWindow)) #define LIBRARY_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_LIBRARY_WINDOW, LibraryWindowClass)) @@ -418,7 +418,7 @@ typedef struct _TagUntagPhotosCommandClass TagUntagPhotosCommandClass; struct _Page { GtkScrolledWindow parent_instance; PagePrivate * priv; - GtkUIManager* ui; + GtkBuilder* builder; GtkToolbar* toolbar; gboolean in_view; }; @@ -428,8 +428,6 @@ struct _PageClass { void (*set_page_name) (Page* self, const gchar* page_name); void (*set_container) (Page* self, GtkWindow* container); void (*clear_container) (Page* self); - GtkMenuBar* (*get_menubar) (Page* self); - GtkWidget* (*get_page_ui_widget) (Page* self, const gchar* path); GtkToolbar* (*get_toolbar) (Page* self); GtkMenu* (*get_page_context_menu) (Page* self); void (*switching_from) (Page* self); @@ -437,10 +435,8 @@ struct _PageClass { void (*ready) (Page* self); void (*switching_to_fullscreen) (Page* self, FullscreenWindow* fsw); void (*returning_from_fullscreen) (Page* self, FullscreenWindow* fsw); + void (*add_actions) (Page* self); void (*init_collect_ui_filenames) (Page* self, GeeList* ui_filenames); - GtkActionEntry* (*init_collect_action_entries) (Page* self, int* result_length1); - GtkToggleActionEntry* (*init_collect_toggle_action_entries) (Page* self, int* result_length1); - void (*register_radio_actions) (Page* self, GtkActionGroup* action_group); InjectionGroup** (*init_collect_injection_groups) (Page* self, int* result_length1); void (*init_actions) (Page* self, gint selected_count, gint count); void (*update_actions) (Page* self, gint selected_count, gint count); @@ -552,13 +548,13 @@ struct _MediaPageClass { void (*on_move_to_trash) (MediaPage* self); void (*on_edit_title) (MediaPage* self); void (*on_edit_comment) (MediaPage* self); - void (*on_display_titles) (MediaPage* self, GtkAction* action); - void (*on_display_comments) (MediaPage* self, GtkAction* action); - void (*on_display_ratings) (MediaPage* self, GtkAction* action); - void (*on_display_tags) (MediaPage* self, GtkAction* action); + void (*on_display_titles) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_comments) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_ratings) (MediaPage* self, GSimpleAction* action, GVariant* value); + void (*on_display_tags) (MediaPage* self, GSimpleAction* action, GVariant* value); void (*get_config_photos_sort) (MediaPage* self, gboolean* sort_order, gint* sort_by); void (*set_config_photos_sort) (MediaPage* self, gboolean sort_order, gint sort_by); - void (*on_sort_changed) (MediaPage* self); + void (*on_sort_changed) (MediaPage* self, GSimpleAction* action, GVariant* value); void (*developer_changed) (MediaPage* self, RawDeveloper rd); DataView* (*create_thumbnail) (MediaPage* self, DataSource* source); }; @@ -659,6 +655,14 @@ gpointer value_get_alteration (const GValue* value); GType alteration_get_type (void) G_GNUC_CONST; static void tag_page_on_tags_altered (TagPage* self, GeeMap* map); static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self); +static void tag_page_on_delete_tag (TagPage* self); +static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void tag_page_on_rename_tag (TagPage* self); +static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void tag_page_on_remove_tag_from_photos (TagPage* self); +static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); +static void tag_page_on_new_child_tag_sidebar (TagPage* self); +static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); TagPage* tag_page_new (Tag* tag); TagPage* tag_page_construct (GType object_type, Tag* tag); gchar* data_object_get_name (DataObject* self); @@ -677,36 +681,23 @@ ConfigFacade* config_facade_get_instance (void); void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboolean* sort_order, gint* sort_by); static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort_order, gint sort_by); void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboolean sort_order, gint sort_by); -static GtkActionEntry* tag_page_real_init_collect_action_entries (Page* base, int* result_length1); -GtkActionEntry* page_init_collect_action_entries (Page* self, int* result_length1); -#define TRANSLATABLE "translatable" -static void tag_page_on_delete_tag (TagPage* self); -static void _tag_page_on_delete_tag_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add134 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void tag_page_on_rename_tag (TagPage* self); -static void _tag_page_on_rename_tag_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add135 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -static void tag_page_on_remove_tag_from_photos (TagPage* self); -static void _tag_page_on_remove_tag_from_photos_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add136 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_DELETE_TAG_SIDEBAR_MENU _ ("_Delete") -static void _vala_array_add137 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_RENAME_TAG_SIDEBAR_MENU _ ("_Rename…") -static void _vala_array_add138 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); -#define RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU _ ("_New") -static void tag_page_on_new_child_tag_sidebar (TagPage* self); -static void _tag_page_on_new_child_tag_sidebar_gtk_action_callback (GtkAction* action, gpointer self); -static void _vala_array_add139 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value); +static void tag_page_real_add_actions (Page* base); +void page_add_actions (Page* self); +GType app_window_get_type (void) G_GNUC_CONST; +AppWindow* app_window_get_instance (void); void page_set_page_name (Page* self, const gchar* page_name); void page_update_actions (Page* self, gint selected_count, gint count); gint view_collection_get_selected_count (ViewCollection* self); gint data_collection_get_count (DataCollection* self); -static void tag_page_real_update_actions (Page* base, gint selected_count, gint count); -void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive); +static void tag_page_real_switched_to (Page* base); +void page_switched_to (Page* self); +void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_label); gchar* resources_delete_tag_menu (const gchar* name); gchar* tag_get_user_visible_name (Tag* self); gchar* resources_rename_tag_menu (const gchar* name); gchar* resources_untag_photos_menu (const gchar* name, gint count); +static void tag_page_real_update_actions (Page* base, gint selected_count, gint count); +void page_set_action_details (Page* self, const gchar* name, const gchar* label, const gchar* tooltip, gboolean sensitive); GType command_get_type (void) G_GNUC_CONST; GType page_command_get_type (void) G_GNUC_CONST; GType simple_proxyable_command_get_type (void) G_GNUC_CONST; @@ -722,7 +713,6 @@ gpointer value_get_command_manager (const GValue* value); GType command_manager_get_type (void) G_GNUC_CONST; CommandManager* app_window_get_command_manager (void); void command_manager_execute (CommandManager* self, Command* command); -GType app_window_get_type (void) G_GNUC_CONST; GType library_window_get_type (void) G_GNUC_CONST; LibraryWindow* library_window_get_app (void); void library_window_rename_tag_in_sidebar (LibraryWindow* self, Tag* tag); @@ -740,18 +730,47 @@ TagUntagPhotosCommand* tag_untag_photos_command_construct (GType object_type, Ta GType tag_untag_photos_command_get_type (void) G_GNUC_CONST; static void tag_page_finalize (GObject* obj); +static const GActionEntry TAG_PAGE_entries[4] = {{"DeleteTag", _tag_page_on_delete_tag_gsimple_action_activate_callback}, {"RenameTag", _tag_page_on_rename_tag_gsimple_action_activate_callback}, {"RemoveTagFromPhotos", _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback}, {"NewChildTagSidebar", _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback}}; static void _tag_page_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) { #line 23 "/home/jens/Source/shotwell/src/tags/TagPage.vala" tag_page_on_tags_altered ((TagPage*) self, items); -#line 748 "TagPage.c" +#line 739 "TagPage.c" +} + + +static void _tag_page_on_delete_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + tag_page_on_delete_tag ((TagPage*) self); +#line 746 "TagPage.c" +} + + +static void _tag_page_on_rename_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + tag_page_on_rename_tag ((TagPage*) self); +#line 753 "TagPage.c" +} + + +static void _tag_page_on_remove_tag_from_photos_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + tag_page_on_remove_tag_from_photos ((TagPage*) self); +#line 760 "TagPage.c" +} + + +static void _tag_page_on_new_child_tag_sidebar_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { +#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + tag_page_on_new_child_tag_sidebar ((TagPage*) self); +#line 767 "TagPage.c" } static gpointer _g_object_ref0 (gpointer self) { #line 13 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return self ? g_object_ref (self) : NULL; -#line 755 "TagPage.c" +#line 774 "TagPage.c" } @@ -760,7 +779,7 @@ static DataView* _media_page_create_thumbnail_create_view (DataSource* source, g result = media_page_create_thumbnail ((MediaPage*) self, source); #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return result; -#line 764 "TagPage.c" +#line 783 "TagPage.c" } @@ -810,17 +829,17 @@ TagPage* tag_page_construct (GType object_type, Tag* tag) { #line 16 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp8_); #line 18 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "/TagsContextMenu"); + checkerboard_page_init_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_PAGE, CheckerboardPage), "TagsContextMenu"); #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return self; -#line 817 "TagPage.c" +#line 836 "TagPage.c" } TagPage* tag_page_new (Tag* tag) { #line 10 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return tag_page_construct (TYPE_TAG_PAGE, tag); -#line 824 "TagPage.c" +#line 843 "TagPage.c" } @@ -840,7 +859,7 @@ static void tag_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_fil _tmp1_ = ui_filenames; #line 28 "/home/jens/Source/shotwell/src/tags/TagPage.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "tags.ui"); -#line 844 "TagPage.c" +#line 863 "TagPage.c" } @@ -858,7 +877,7 @@ Tag* tag_page_get_tag (TagPage* self) { result = _tmp1_; #line 32 "/home/jens/Source/shotwell/src/tags/TagPage.vala" return result; -#line 862 "TagPage.c" +#line 881 "TagPage.c" } @@ -888,13 +907,13 @@ static void tag_page_real_get_config_photos_sort (MediaPage* base, gboolean* sor if (sort_order) { #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" *sort_order = _vala_sort_order; -#line 892 "TagPage.c" +#line 911 "TagPage.c" } #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (sort_by) { #line 35 "/home/jens/Source/shotwell/src/tags/TagPage.vala" *sort_by = _vala_sort_by; -#line 898 "TagPage.c" +#line 917 "TagPage.c" } } @@ -919,325 +938,27 @@ static void tag_page_real_set_config_photos_sort (MediaPage* base, gboolean sort configuration_facade_set_event_photos_sort (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_, _tmp3_); #line 40 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp1_); -#line 923 "TagPage.c" -} - - -static void _tag_page_on_delete_tag_gtk_action_callback (GtkAction* action, gpointer self) { -#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - tag_page_on_delete_tag ((TagPage*) self); -#line 930 "TagPage.c" -} - - -static void _vala_array_add134 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if ((*length) == (*size)) { -#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 941 "TagPage.c" - } -#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - (*array)[(*length)++] = *value; -#line 945 "TagPage.c" -} - - -static void _tag_page_on_rename_tag_gtk_action_callback (GtkAction* action, gpointer self) { -#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - tag_page_on_rename_tag ((TagPage*) self); -#line 952 "TagPage.c" +#line 942 "TagPage.c" } -static void _vala_array_add135 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if ((*length) == (*size)) { -#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 963 "TagPage.c" - } -#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - (*array)[(*length)++] = *value; -#line 967 "TagPage.c" -} - - -static void _tag_page_on_remove_tag_from_photos_gtk_action_callback (GtkAction* action, gpointer self) { -#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - tag_page_on_remove_tag_from_photos ((TagPage*) self); -#line 974 "TagPage.c" -} - - -static void _vala_array_add136 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if ((*length) == (*size)) { -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 985 "TagPage.c" - } -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - (*array)[(*length)++] = *value; -#line 989 "TagPage.c" -} - - -static void _vala_array_add137 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if ((*length) == (*size)) { -#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 1000 "TagPage.c" - } -#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - (*array)[(*length)++] = *value; -#line 1004 "TagPage.c" -} - - -static void _vala_array_add138 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if ((*length) == (*size)) { -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 1015 "TagPage.c" - } -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - (*array)[(*length)++] = *value; -#line 1019 "TagPage.c" -} - - -static void _tag_page_on_new_child_tag_sidebar_gtk_action_callback (GtkAction* action, gpointer self) { -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - tag_page_on_new_child_tag_sidebar ((TagPage*) self); -#line 1026 "TagPage.c" -} - - -static void _vala_array_add139 (GtkActionEntry** array, int* length, int* size, const GtkActionEntry* value) { -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if ((*length) == (*size)) { -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *size = (*size) ? (2 * (*size)) : 4; -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *array = g_renew (GtkActionEntry, *array, *size); -#line 1037 "TagPage.c" - } -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - (*array)[(*length)++] = *value; -#line 1041 "TagPage.c" -} - - -static GtkActionEntry* tag_page_real_init_collect_action_entries (Page* base, int* result_length1) { +static void tag_page_real_add_actions (Page* base) { TagPage * self; - GtkActionEntry* result = NULL; - GtkActionEntry* actions = NULL; - gint _tmp0_ = 0; - GtkActionEntry* _tmp1_ = NULL; - gint actions_length1 = 0; - gint _actions_size_ = 0; - GtkActionEntry delete_tag = {0}; - GtkActionEntry _tmp2_ = {0}; - GtkActionEntry* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GtkActionEntry _tmp4_ = {0}; - GtkActionEntry rename_tag = {0}; - GtkActionEntry _tmp5_ = {0}; - GtkActionEntry* _tmp6_ = NULL; - gint _tmp6__length1 = 0; - GtkActionEntry _tmp7_ = {0}; - GtkActionEntry remove_tag = {0}; - GtkActionEntry _tmp8_ = {0}; - GtkActionEntry* _tmp9_ = NULL; - gint _tmp9__length1 = 0; - GtkActionEntry _tmp10_ = {0}; - GtkActionEntry delete_tag_sidebar = {0}; - GtkActionEntry _tmp11_ = {0}; - GtkActionEntry* _tmp12_ = NULL; - gint _tmp12__length1 = 0; - GtkActionEntry _tmp13_ = {0}; - GtkActionEntry rename_tag_sidebar = {0}; - GtkActionEntry _tmp14_ = {0}; - GtkActionEntry* _tmp15_ = NULL; - gint _tmp15__length1 = 0; - GtkActionEntry _tmp16_ = {0}; - GtkActionEntry new_child_tag_sidebar = {0}; - GtkActionEntry _tmp17_ = {0}; - GtkActionEntry* _tmp18_ = NULL; - gint _tmp18__length1 = 0; - GtkActionEntry _tmp19_ = {0}; - GtkActionEntry* _tmp20_ = NULL; - gint _tmp20__length1 = 0; -#line 43 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); -#line 44 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp1_ = PAGE_CLASS (tag_page_parent_class)->init_collect_action_entries (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), &_tmp0_); -#line 44 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - actions = _tmp1_; -#line 44 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - actions_length1 = _tmp0_; -#line 44 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _actions_size_ = actions_length1; -#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_.name = "DeleteTag"; -#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_.stock_id = NULL; -#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_.label = TRANSLATABLE; -#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_.accelerator = NULL; -#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_.tooltip = NULL; -#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp2_.callback = (GCallback) _tag_page_on_delete_tag_gtk_action_callback; -#line 46 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - delete_tag = _tmp2_; -#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3_ = actions; -#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp3__length1 = actions_length1; -#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp4_ = delete_tag; -#line 48 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _vala_array_add134 (&actions, &actions_length1, &_actions_size_, &_tmp4_); -#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_.name = "RenameTag"; -#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_.stock_id = NULL; -#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_.label = TRANSLATABLE; -#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_.accelerator = NULL; + AppWindow* _tmp0_ = NULL; + AppWindow* _tmp1_ = NULL; #line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_.tooltip = NULL; -#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp5_.callback = (GCallback) _tag_page_on_rename_tag_gtk_action_callback; -#line 50 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - rename_tag = _tmp5_; -#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp6_ = actions; -#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp6__length1 = actions_length1; -#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp7_ = rename_tag; -#line 52 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _vala_array_add135 (&actions, &actions_length1, &_actions_size_, &_tmp7_); -#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_.name = "RemoveTagFromPhotos"; -#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_.stock_id = NULL; -#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_.label = TRANSLATABLE; -#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_.accelerator = NULL; -#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_.tooltip = NULL; -#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp8_.callback = (GCallback) _tag_page_on_remove_tag_from_photos_gtk_action_callback; -#line 54 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - remove_tag = _tmp8_; -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp9_ = actions; -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp9__length1 = actions_length1; -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp10_ = remove_tag; -#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _vala_array_add136 (&actions, &actions_length1, &_actions_size_, &_tmp10_); -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp11_.name = "DeleteTagSidebar"; -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp11_.stock_id = NULL; -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp11_.label = RESOURCES_DELETE_TAG_SIDEBAR_MENU; -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp11_.accelerator = NULL; -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp11_.tooltip = NULL; -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp11_.callback = (GCallback) _tag_page_on_delete_tag_gtk_action_callback; -#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - delete_tag_sidebar = _tmp11_; -#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp12_ = actions; -#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp12__length1 = actions_length1; -#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp13_ = delete_tag_sidebar; -#line 61 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _vala_array_add137 (&actions, &actions_length1, &_actions_size_, &_tmp13_); -#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp14_.name = "RenameTagSidebar"; -#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp14_.stock_id = NULL; -#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp14_.label = RESOURCES_RENAME_TAG_SIDEBAR_MENU; -#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp14_.accelerator = NULL; -#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp14_.tooltip = NULL; -#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp14_.callback = (GCallback) _tag_page_on_rename_tag_gtk_action_callback; -#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - rename_tag_sidebar = _tmp14_; -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp15_ = actions; -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp15__length1 = actions_length1; -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp16_ = rename_tag_sidebar; -#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _vala_array_add138 (&actions, &actions_length1, &_actions_size_, &_tmp16_); -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp17_.name = "NewChildTagSidebar"; -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp17_.stock_id = NULL; -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp17_.label = RESOURCES_NEW_CHILD_TAG_SIDEBAR_MENU; -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp17_.accelerator = NULL; -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp17_.tooltip = NULL; -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp17_.callback = (GCallback) _tag_page_on_new_child_tag_sidebar_gtk_action_callback; -#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - new_child_tag_sidebar = _tmp17_; -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp18_ = actions; -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp18__length1 = actions_length1; -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp19_ = new_child_tag_sidebar; -#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _vala_array_add139 (&actions, &actions_length1, &_actions_size_, &_tmp19_); -#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp20_ = actions; -#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - _tmp20__length1 = actions_length1; -#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - if (result_length1) { -#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - *result_length1 = _tmp20__length1; -#line 1235 "TagPage.c" - } -#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - result = _tmp20_; -#line 71 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - return result; -#line 1241 "TagPage.c" + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); +#line 51 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + PAGE_CLASS (tag_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page)); +#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp0_ = app_window_get_instance (); +#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp1_ = _tmp0_; +#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), TAG_PAGE_entries, G_N_ELEMENTS (TAG_PAGE_entries), self); +#line 53 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _g_object_unref0 (_tmp1_); +#line 962 "TagPage.c" } @@ -1245,19 +966,19 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { GeeMap* _tmp0_ = NULL; Tag* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; -#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); -#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 56 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (GEE_IS_MAP (map)); -#line 75 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = map; -#line 75 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = self->priv->tag; -#line 75 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject)); -#line 75 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 57 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp2_) { -#line 1261 "TagPage.c" +#line 982 "TagPage.c" Tag* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; @@ -1267,39 +988,112 @@ static void tag_page_on_tags_altered (TagPage* self, GeeMap* map) { ViewCollection* _tmp9_ = NULL; ViewCollection* _tmp10_ = NULL; gint _tmp11_ = 0; -#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = self->priv->tag; -#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject)); -#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = _tmp4_; -#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp5_); -#line 76 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 58 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp5_); -#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp7_ = _tmp6_; -#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp8_ = view_collection_get_selected_count (_tmp7_); -#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp10_ = _tmp9_; -#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp11_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection)); -#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp8_, _tmp11_); -#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp10_); -#line 77 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 59 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp7_); -#line 1299 "TagPage.c" +#line 1020 "TagPage.c" } } +static void tag_page_real_switched_to (Page* base) { + TagPage * self; + Tag* _tmp0_ = NULL; + gchar* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; + gchar* _tmp3_ = NULL; + gchar* _tmp4_ = NULL; + Tag* _tmp5_ = NULL; + gchar* _tmp6_ = NULL; + gchar* _tmp7_ = NULL; + gchar* _tmp8_ = NULL; + gchar* _tmp9_ = NULL; + Tag* _tmp10_ = NULL; + gchar* _tmp11_ = NULL; + gchar* _tmp12_ = NULL; + gchar* _tmp13_ = NULL; + gchar* _tmp14_ = NULL; +#line 63 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); +#line 64 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + PAGE_CLASS (tag_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page)); +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp0_ = self->priv->tag; +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp1_ = tag_get_user_visible_name (_tmp0_); +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp2_ = _tmp1_; +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp3_ = resources_delete_tag_menu (_tmp2_); +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp4_ = _tmp3_; +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteTag", _tmp4_); +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _g_free0 (_tmp4_); +#line 65 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _g_free0 (_tmp2_); +#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp5_ = self->priv->tag; +#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp6_ = tag_get_user_visible_name (_tmp5_); +#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp7_ = _tmp6_; +#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp8_ = resources_rename_tag_menu (_tmp7_); +#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp9_ = _tmp8_; +#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RenameTag", _tmp9_); +#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _g_free0 (_tmp9_); +#line 67 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _g_free0 (_tmp7_); +#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp10_ = self->priv->tag; +#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp11_ = tag_get_user_visible_name (_tmp10_); +#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp12_ = _tmp11_; +#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp13_ = resources_untag_photos_menu (_tmp12_, 0); +#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _tmp14_ = _tmp13_; +#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + page_update_menu_item_label (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp14_); +#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _g_free0 (_tmp14_); +#line 69 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + _g_free0 (_tmp12_); +#line 1094 "TagPage.c" +} + + static void tag_page_real_update_actions (Page* base, gint selected_count, gint count) { TagPage * self; Tag* _tmp0_ = NULL; @@ -1321,67 +1115,67 @@ static void tag_page_real_update_actions (Page* base, gint selected_count, gint gint _tmp16_ = 0; gint _tmp17_ = 0; gint _tmp18_ = 0; -#line 81 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 73 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_TAG_PAGE, TagPage); -#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = self->priv->tag; -#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = tag_get_user_visible_name (_tmp0_); -#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = _tmp1_; -#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = resources_delete_tag_menu (_tmp2_); -#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = _tmp3_; -#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DeleteTag", _tmp4_, NULL, TRUE); -#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp4_); -#line 82 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 74 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp2_); -#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = self->priv->tag; -#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = tag_get_user_visible_name (_tmp5_); -#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp7_ = _tmp6_; -#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp8_ = resources_rename_tag_menu (_tmp7_); -#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp9_ = _tmp8_; -#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RenameTag", _tmp9_, NULL, TRUE); -#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp9_); -#line 87 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 79 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp7_); -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp10_ = self->priv->tag; -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp11_ = tag_get_user_visible_name (_tmp10_); -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp12_ = _tmp11_; -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp13_ = selected_count; -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp14_ = resources_untag_photos_menu (_tmp12_, _tmp13_); -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp15_ = _tmp14_; -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp16_ = selected_count; -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" page_set_action_details (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RemoveTagFromPhotos", _tmp15_, NULL, _tmp16_ > 0); -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp15_); -#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 84 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_free0 (_tmp12_); -#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp17_ = selected_count; -#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp18_ = count; -#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 89 "/home/jens/Source/shotwell/src/tags/TagPage.vala" PAGE_CLASS (tag_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_COLLECTION_PAGE, CollectionPage), TYPE_PAGE, Page), _tmp17_, _tmp18_); -#line 1385 "TagPage.c" +#line 1179 "TagPage.c" } @@ -1395,39 +1189,39 @@ static void tag_page_on_new_child_tag_sidebar (TagPage* self) { LibraryWindow* _tmp5_ = NULL; Tag* _tmp6_ = NULL; Tag* _tmp7_ = NULL; -#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); -#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = self->priv->tag; -#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = new_child_tag_command_new (_tmp0_); -#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 93 "/home/jens/Source/shotwell/src/tags/TagPage.vala" creation_command = _tmp1_; -#line 103 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = app_window_get_command_manager (); -#line 103 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = _tmp2_; -#line 103 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala" command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command)); -#line 103 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 95 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _command_manager_unref0 (_tmp3_); -#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = library_window_get_app (); -#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = _tmp4_; -#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = new_child_tag_command_get_created_child (creation_command); -#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp7_ = _tmp6_; -#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" library_window_rename_tag_in_sidebar (_tmp5_, _tmp7_); -#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp7_); -#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 97 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp5_); -#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 92 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (creation_command); -#line 1431 "TagPage.c" +#line 1225 "TagPage.c" } @@ -1435,56 +1229,56 @@ static void tag_page_on_rename_tag (TagPage* self) { LibraryWindow* _tmp0_ = NULL; LibraryWindow* _tmp1_ = NULL; Tag* _tmp2_ = NULL; -#line 108 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 100 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); -#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = library_window_get_app (); -#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = _tmp0_; -#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = self->priv->tag; -#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" library_window_rename_tag_in_sidebar (_tmp1_, _tmp2_); -#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 101 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp1_); -#line 1451 "TagPage.c" +#line 1245 "TagPage.c" } static void tag_page_on_delete_tag (TagPage* self) { Tag* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 112 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 104 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); -#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = self->priv->tag; -#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = dialogs_confirm_delete_tag (_tmp0_); -#line 113 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 105 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp1_) { -#line 1466 "TagPage.c" +#line 1260 "TagPage.c" CommandManager* _tmp2_ = NULL; CommandManager* _tmp3_ = NULL; Tag* _tmp4_ = NULL; DeleteTagCommand* _tmp5_ = NULL; DeleteTagCommand* _tmp6_ = NULL; -#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = app_window_get_command_manager (); -#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = _tmp2_; -#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = self->priv->tag; -#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = delete_tag_command_new (_tmp4_); -#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = _tmp5_; -#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command)); -#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp6_); -#line 114 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 106 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _command_manager_unref0 (_tmp3_); -#line 1488 "TagPage.c" +#line 1282 "TagPage.c" } } @@ -1494,21 +1288,21 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) { ViewCollection* _tmp1_ = NULL; gint _tmp2_ = 0; gboolean _tmp3_ = FALSE; -#line 117 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 109 "/home/jens/Source/shotwell/src/tags/TagPage.vala" g_return_if_fail (IS_TAG_PAGE (self)); -#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp1_ = _tmp0_; -#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp2_ = view_collection_get_selected_count (_tmp1_); -#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp3_ = _tmp2_ > 0; -#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp1_); -#line 118 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 110 "/home/jens/Source/shotwell/src/tags/TagPage.vala" if (_tmp3_) { -#line 1512 "TagPage.c" +#line 1306 "TagPage.c" CommandManager* _tmp4_ = NULL; CommandManager* _tmp5_ = NULL; Tag* _tmp6_ = NULL; @@ -1521,43 +1315,43 @@ static void tag_page_on_remove_tag_from_photos (TagPage* self) { gint _tmp13_ = 0; TagUntagPhotosCommand* _tmp14_ = NULL; TagUntagPhotosCommand* _tmp15_ = NULL; -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp5_ = _tmp4_; -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp6_ = self->priv->tag; -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp8_ = _tmp7_; -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp9_ = view_collection_get_selected_sources (_tmp8_); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp12_ = _tmp11_; -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp13_ = view_collection_get_selected_count (_tmp12_); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp14_ = tag_untag_photos_command_new (_tmp6_, _tmp10_, _tmp13_, FALSE); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _tmp15_ = _tmp14_; -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_COMMAND, Command)); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp15_); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp12_); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _g_object_unref0 (_tmp10_); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _data_collection_unref0 (_tmp8_); -#line 119 "/home/jens/Source/shotwell/src/tags/TagPage.vala" +#line 111 "/home/jens/Source/shotwell/src/tags/TagPage.vala" _command_manager_unref0 (_tmp5_); -#line 1561 "TagPage.c" +#line 1355 "TagPage.c" } } @@ -1574,19 +1368,21 @@ static void tag_page_class_init (TagPageClass * klass) { #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" ((MediaPageClass *) klass)->set_config_photos_sort = tag_page_real_set_config_photos_sort; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" - ((PageClass *) klass)->init_collect_action_entries = tag_page_real_init_collect_action_entries; + ((PageClass *) klass)->add_actions = tag_page_real_add_actions; +#line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" + ((PageClass *) klass)->switched_to = tag_page_real_switched_to; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" ((PageClass *) klass)->update_actions = tag_page_real_update_actions; #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" G_OBJECT_CLASS (klass)->finalize = tag_page_finalize; -#line 1583 "TagPage.c" +#line 1379 "TagPage.c" } static void tag_page_instance_init (TagPage * self) { #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" self->priv = TAG_PAGE_GET_PRIVATE (self); -#line 1590 "TagPage.c" +#line 1386 "TagPage.c" } @@ -1616,7 +1412,7 @@ static void tag_page_finalize (GObject* obj) { _g_object_unref0 (self->priv->tag); #line 7 "/home/jens/Source/shotwell/src/tags/TagPage.vala" G_OBJECT_CLASS (tag_page_parent_class)->finalize (obj); -#line 1620 "TagPage.c" +#line 1416 "TagPage.c" } -- cgit v1.2.3