diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-09-30 14:09:32 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-09-30 14:09:32 +0200 |
| commit | 0537caaf4af94a9ead8b292679f6b34c90b55e06 (patch) | |
| tree | 6761cfdf959926be7af3147cf770e7f253390fe8 /src/main.vala | |
| parent | eca5837e235a356c8db9416bbbc13577db3e6f76 (diff) | |
| parent | 5e9f4eea451a77ba3b93db3747841ed2bd969e9f (diff) | |
Update upstream source from tag 'upstream/0.30.1'
Update to upstream version '0.30.1'
with Debian dir dc242531effff8d9c6fab093414edee28b403c6a
Diffstat (limited to 'src/main.vala')
| -rw-r--r-- | src/main.vala | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/main.vala b/src/main.vala index d09c827..8313ba1 100644 --- a/src/main.vala +++ b/src/main.vala @@ -99,6 +99,10 @@ void library_exec(string[] mounts) { + EventTable.get_instance().get_row_count() + TagTable.get_instance().get_row_count() + VideoTable.get_instance().get_row_count() +#if ENABLE_FACES + + FaceTable.get_instance().get_row_count() + + FaceLocationTable.get_instance().get_row_count() +#endif + Upgrades.get_instance().get_step_count(); if (grand_total > 5000) { progress_dialog = new ProgressDialog(null, _("Loading Shotwell")); @@ -142,6 +146,14 @@ void library_exec(string[] mounts) { if (aggregate_monitor != null) aggregate_monitor.next_step("Tag.init"); Tag.init(monitor); +#if ENABLE_FACES + if (aggregate_monitor != null) + aggregate_monitor.next_step("FaceLocation.init"); + FaceLocation.init(monitor); + if (aggregate_monitor != null) + aggregate_monitor.next_step("Face.init"); + Face.init(monitor); +#endif MetadataWriter.init(); DesktopIntegration.init(); @@ -207,6 +219,11 @@ void library_exec(string[] mounts) { Tombstone.terminate(); ThumbnailCache.terminate(); Video.terminate(); +#if ENABLE_FACES + Face.terminate(); + FaceLocation.terminate(); +#endif + Library.app_terminate(); } @@ -355,13 +372,16 @@ void main(string[] args) { try { Gtk.init_with_args(ref args, _("[FILE]"), CommandlineOptions.get_options(), Resources.APP_GETTEXT_PACKAGE); + + var use_dark = Config.Facade.get_instance().get_gtk_theme_variant(); + Gtk.Settings.get_default().gtk_application_prefer_dark_theme = use_dark; } catch (Error e) { print(e.message + "\n"); print(_("Run “%s --help” to see a full list of available command line options.\n"), args[0]); AppDirs.terminate(); return; } - + if (CommandlineOptions.show_version) { if (Resources.GIT_VERSION != null) print("%s %s (%s)\n", Resources.APP_TITLE, Resources.APP_VERSION, Resources.GIT_VERSION); @@ -403,7 +423,6 @@ void main(string[] args) { message("Shotwell %s %s", is_string_empty(filename) ? Resources.APP_LIBRARY_ROLE : Resources.APP_DIRECT_ROLE, Resources.APP_VERSION); - debug ("Shotwell is running in timezone %s", new DateTime.now_local().get_timezone_abbreviation ()); |