diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2022-05-21 19:44:47 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2022-05-21 19:44:47 +0200 |
| commit | ba553455d2d1dae08348020001844794502d0ac0 (patch) | |
| tree | 98c41a82a02589269d79423907e046397107e080 /src/PhotoPage.vala | |
| parent | 6dc4a14e122270c93a2940011ec451719aac22d2 (diff) | |
| parent | a8c434f4f345295c14ec60106ca2693c25db1d83 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/PhotoPage.vala')
| -rw-r--r-- | src/PhotoPage.vala | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala index bced0ea..fd513b2 100644 --- a/src/PhotoPage.vala +++ b/src/PhotoPage.vala @@ -396,9 +396,7 @@ public abstract class EditingHostPage : SinglePhotoPage { private Gtk.ToggleToolButton redeye_button = null; private Gtk.ToggleToolButton adjust_button = null; private Gtk.ToggleToolButton straighten_button = null; -#if ENABLE_FACES private Gtk.ToggleToolButton faces_button = null; -#endif private Gtk.ToolButton enhance_button = null; private Gtk.Scale zoom_slider = null; private Gtk.ToolButton prev_button = new Gtk.ToolButton(null, Resources.PREVIOUS_LABEL); @@ -491,12 +489,10 @@ public abstract class EditingHostPage : SinglePhotoPage { enhance_button.is_important = true; toolbar.insert(enhance_button, -1); -#if ENABLE_FACES // faces tool insert_faces_button(toolbar); faces_button = new Gtk.ToggleToolButton(); //face_button -#endif // separator to force next/prev buttons to right side of toolbar Gtk.SeparatorToolItem separator = new Gtk.SeparatorToolItem(); @@ -2357,9 +2353,7 @@ public class LibraryPhotoPage : EditingHostPage { } } -#if ENABLE_FACES private Gtk.ToggleToolButton faces_button = null; -#endif private CollectionPage? return_page = null; private bool return_to_collection_on_release = false; private LibraryPhotoPageViewFilter filter = new LibraryPhotoPageViewFilter(); @@ -3168,7 +3162,6 @@ public class LibraryPhotoPage : EditingHostPage { get_command_manager().execute(new ModifyTagsCommand(photo, new_tags)); } -#if ENABLE_FACES private void on_faces_toggled() { on_tool_button_toggled(faces_button, FacesTool.factory); } @@ -3186,6 +3179,5 @@ public class LibraryPhotoPage : EditingHostPage { faces_button.is_important = true; toolbar.insert(faces_button, -1); } -#endif } |