Commit cc1031bd authored by Jim Nelson's avatar Jim Nelson

Fixed regression in DataSource's signal reflection to DataView. This fixes...

Fixed regression in DataSource's signal reflection to DataView.  This fixes #2598, #2597, and #2595.Also updated strings for #2591 and #2610.
parent 601b2d5f
......@@ -588,10 +588,13 @@ public abstract class DataSource : DataObject {
public override void notify_altered(Alteration alteration) {
// re-route this to the SourceHoldingTank if held in one
if (holding_tank != null)
if (holding_tank != null) {
holding_tank.internal_notify_altered(this, alteration);
else
} else {
contact_subscribers_alteration(alteration);
base.notify_altered(alteration);
}
}
// This method is called by SourceCollection. It should not be called otherwise.
......@@ -898,6 +901,17 @@ public abstract class DataSource : DataObject {
}
in_contact = false;
}
protected void contact_subscribers_alteration(Alteration alteration) {
assert(!in_contact);
in_contact = true;
for (int ctr = 0; ctr < subscribers.length; ctr++) {
if (subscribers[ctr] != null)
subscribers[ctr].notify_altered(alteration);
}
in_contact = false;
}
}
public abstract class ThumbnailSource : DataSource {
......
......@@ -333,7 +333,7 @@ public class EventsDirectoryPage : CheckerboardPage {
}
public class NoEventPage : CollectionPage {
static const string NO_EVENT_PAGE_NAME = "No Events";
static const string NO_EVENT_PAGE_NAME = _("No Event");
public class Stub : PageStub {
public override string? get_icon_name() {
......
......@@ -1390,7 +1390,7 @@ public class ImportQueuePage : SinglePhotoPage {
}
private void on_preparing() {
progress_bar.set_text(_("Importing..."));
progress_bar.set_text(_("Preparing to import..."));
progress_bar.pulse();
}
......
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