Commit 71e793c1 authored by Allison Barlow's avatar Allison Barlow

fixes #1469 fullscreen segfault, #1470 remove New Event from context menu#1471...

fixes #1469 fullscreen segfault, #1470 remove New Event from context menu#1471 duplicate mnemonic in Photos menu.
parent c7c0317c
......@@ -311,7 +311,7 @@ public abstract class CollectionPage : CheckerboardPage {
Gtk.ActionEntry slideshow = { "Slideshow", Gtk.STOCK_MEDIA_PLAY, TRANSLATABLE, "F5",
TRANSLATABLE, on_slideshow };
slideshow.label = _("S_lideshow");
slideshow.label = _("_Slideshow");
slideshow.tooltip = _("Play a slideshow");
actions += slideshow;
......@@ -528,7 +528,6 @@ public abstract class CollectionPage : CheckerboardPage {
set_item_sensitive("/CollectionContextMenu/ContextDuplicate", selected);
set_item_sensitive("/CollectionContextMenu/ContextRemove", selected);
set_item_sensitive("/CollectionContextMenu/ContextNewEvent", selected);
set_item_sensitive("/CollectionContextMenu/ContextRotateClockwise", selected);
set_item_sensitive("/CollectionContextMenu/ContextRotateCounterclockwise", selected);
set_item_sensitive("/CollectionContextMenu/ContextEnhance", selected);
......
......@@ -25,6 +25,7 @@ public abstract class Page : Gtk.ScrolledWindow, SidebarPage {
private bool report_move_finished = false;
private bool report_resize_finished = false;
private Gdk.Point last_down = Gdk.Point();
private bool is_destroyed = false;
protected bool ctrl_pressed = false;
protected bool alt_pressed = false;
protected bool shift_pressed = false;
......@@ -55,6 +56,8 @@ public abstract class Page : Gtk.ScrolledWindow, SidebarPage {
// This is called by the page controller when it has removed this page ... pages should override
// this (or the signal) to clean up
public override void destroy() {
debug("Page %s Destroyed", get_page_name());
// untie signals
detach_event_source();
view.close();
......@@ -77,6 +80,8 @@ public abstract class Page : Gtk.ScrolledWindow, SidebarPage {
// explicitly
toolbar.destroy();
is_destroyed = true;
base.destroy();
}
......@@ -675,6 +680,9 @@ public abstract class Page : Gtk.ScrolledWindow, SidebarPage {
}
private bool check_configure_halted() {
if (is_destroyed)
return false;
if ((now_ms() - last_configure_ms) < CONSIDER_CONFIGURE_HALTED_MSEC)
return true;
......
......@@ -442,6 +442,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
#if MEASURE_PIPELINE
Timer timer = new Timer();
#endif
Gdk.Pixbuf pixbuf = null;
Dimensions max_dim = get_photo().get_dimensions();
......
......@@ -98,8 +98,6 @@
<menuitem name="ContextFavoriteUnfavorite" action="FavoriteUnfavorite" />
<menuitem name="ContextHideUnhide" action="HideUnhide" />
<separator />
<menuitem name="ContextNewEvent" action="NewEvent" />
<separator />
<menuitem name="ContextDuplicate" action="Duplicate" />
<menuitem name="ContextRemove" action="Remove" />
<separator />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment