GNOME.org
 

[shotwell] Remove Map display

commit e9829cefa3eb11a7adfd61eb849b11476342def2
Author: Jens Georg <mail jensge org>
Date:   Sat Apr 2 14:47:24 2022 +0200

    Remove Map display
    
    Clutter and GtkClutter are out of maintenance now. Map widget will
    return if GTK4 shotwell is ever a thing

 data/ui/event.ui               |  5 -----
 data/ui/events_directory.ui    |  5 -----
 data/ui/import.ui              |  5 -----
 data/ui/media.ui               |  5 -----
 data/ui/offline.ui             |  5 -----
 data/ui/photo.ui               |  5 -----
 data/ui/tags.ui                |  5 -----
 data/ui/trash.ui               |  5 -----
 meson.build                    |  4 ----
 src/CheckerboardPage.vala      |  5 -----
 src/Properties.vala            |  6 ------
 src/Resources.vala             | 21 ---------------------
 src/library/LibraryWindow.vala | 17 -----------------
 src/main.vala                  |  2 +-
 src/meson.build                |  4 +---
 15 files changed, 2 insertions(+), 97 deletions(-)
---
diff --git a/data/ui/event.ui b/data/ui/event.ui
index ea2e0c39..9579f964 100644
--- a/data/ui/event.ui
+++ b/data/ui/event.ui
@@ -123,11 +123,6 @@
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
           <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
-        <item>
-          <attribute name="label" translatable="yes">_Map Overview</attribute>
-          <attribute name="accel">F10</attribute>
-          <attribute name="action">win.CommonDisplayMap</attribute>
-        </item>
       </section>
       <section>
         <item>
diff --git a/data/ui/events_directory.ui b/data/ui/events_directory.ui
index 00dba593..6d0e939e 100644
--- a/data/ui/events_directory.ui
+++ b/data/ui/events_directory.ui
@@ -95,11 +95,6 @@
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
           <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
-        <item>
-          <attribute name="label" translatable="yes">_Map Overview</attribute>
-          <attribute name="accel">F10</attribute>
-          <attribute name="action">win.CommonDisplayMap</attribute>
-        </item>
       </section>
       <section>
         <item>
diff --git a/data/ui/import.ui b/data/ui/import.ui
index c23b2f96..6f13e314 100644
--- a/data/ui/import.ui
+++ b/data/ui/import.ui
@@ -98,11 +98,6 @@
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
           <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
-        <item>
-          <attribute name="label" translatable="yes">_Map Overview</attribute>
-          <attribute name="accel">F10</attribute>
-          <attribute name="action">win.CommonDisplayMap</attribute>
-        </item>
       </section>
       <section>
         <item>
diff --git a/data/ui/media.ui b/data/ui/media.ui
index 3cd7ab41..22a6b835 100644
--- a/data/ui/media.ui
+++ b/data/ui/media.ui
@@ -123,11 +123,6 @@
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
           <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
-        <item>
-          <attribute name="label" translatable="yes">_Map Overview</attribute>
-          <attribute name="accel">F10</attribute>
-          <attribute name="action">win.CommonDisplayMap</attribute>
-        </item>
       </section>
       <section>
         <item>
diff --git a/data/ui/offline.ui b/data/ui/offline.ui
index 3372f0af..3daefca3 100644
--- a/data/ui/offline.ui
+++ b/data/ui/offline.ui
@@ -102,11 +102,6 @@
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
           <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
-        <item>
-          <attribute name="label" translatable="yes">_Map Overview</attribute>
-          <attribute name="accel">F10</attribute>
-          <attribute name="action">win.CommonDisplayMap</attribute>
-        </item>
       </section>
       <section>
         <submenu>
diff --git a/data/ui/photo.ui b/data/ui/photo.ui
index 58316c70..78a2fb5f 100644
--- a/data/ui/photo.ui
+++ b/data/ui/photo.ui
@@ -116,11 +116,6 @@
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
           <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
-        <item>
-          <attribute name="label" translatable="yes">_Map Overview</attribute>
-          <attribute name="accel">F10</attribute>
-          <attribute name="action">win.CommonDisplayMap</attribute>
-        </item>
       </section>
       <section>
         <item>
diff --git a/data/ui/tags.ui b/data/ui/tags.ui
index 66b62f94..03378aee 100644
--- a/data/ui/tags.ui
+++ b/data/ui/tags.ui
@@ -123,11 +123,6 @@
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
           <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
-        <item>
-          <attribute name="label" translatable="yes">_Map Overview</attribute>
-          <attribute name="accel">F10</attribute>
-          <attribute name="action">win.CommonDisplayMap</attribute>
-        </item>
       </section>
       <section>
         <item>
diff --git a/data/ui/trash.ui b/data/ui/trash.ui
index cf18c2aa..1dc188d3 100644
--- a/data/ui/trash.ui
+++ b/data/ui/trash.ui
@@ -111,11 +111,6 @@
           <attribute name="accel">&lt;Primary&gt;F9</attribute>
           <attribute name="action">win.CommonDisplayToolbar</attribute>
         </item>
-        <item>
-          <attribute name="label" translatable="yes">_Map Overview</attribute>
-          <attribute name="accel">F10</attribute>
-          <attribute name="action">win.CommonDisplayMap</attribute>
-        </item>
       </section>
       <section>
         <submenu>
diff --git a/meson.build b/meson.build
index b3b7abb6..b8735b5d 100644
--- a/meson.build
+++ b/meson.build
@@ -65,10 +65,6 @@ libraw = dependency('libraw', version : '>= 0.13.2')
 libexif = dependency('libexif', version : '>= 0.6.16')
 unity = dependency('unity', required : false)
 secret = dependency('libsecret-1', required: true)
-champlain = dependency('champlain-0.12', version: '>= 0.12.16')
-champlain_gtk = dependency('champlain-gtk-0.12')
-clutter = dependency('clutter-1.0')
-clutter_gtk = dependency('clutter-gtk-1.0')
 gdk = [ dependency('gdk-x11-3.0'), dependency('gdk-wayland-3.0') ]
  
 webpdemux = dependency('libwebpdemux')
diff --git a/src/CheckerboardPage.vala b/src/CheckerboardPage.vala
index 6d170680..24a252a6 100644
--- a/src/CheckerboardPage.vala
+++ b/src/CheckerboardPage.vala
@@ -20,7 +20,6 @@ public abstract class CheckerboardPage : Page {
     private bool autoscroll_scheduled = false;
     private CheckerboardItem activated_item = null;
     private Gee.ArrayList<CheckerboardItem> previously_selected = null;
-    private MapWidget map_widget = null;
 
     public enum Activator {
         KEYBOARD,
@@ -77,8 +76,6 @@ public abstract class CheckerboardPage : Page {
 
         // scrollbar policy
         set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC);
-
-        map_widget = MapWidget.get_instance();
     }
 
     public void init_item_context_menu(string path) {
@@ -536,7 +533,6 @@ public abstract class CheckerboardPage : Page {
         // either something new is highlighted or now hovering over empty space, so dim old item
         if (current_hovered_item != null) {
             current_hovered_item.handle_mouse_leave();
-            map_widget.unhighlight_position_marker(current_hovered_item);
             current_hovered_item = null;
         }
 
@@ -547,7 +543,6 @@ public abstract class CheckerboardPage : Page {
         // brighten the new item
         current_hovered_item = item;
         current_hovered_item.handle_mouse_enter();
-        map_widget.highlight_position_marker(item);
 
         return true;
     }
diff --git a/src/Properties.vala b/src/Properties.vala
index 1b4d0efe..181957ba 100644
--- a/src/Properties.vala
+++ b/src/Properties.vala
@@ -175,13 +175,9 @@ private class BasicProperties : Properties {
     private double clip_duration;
     private string raw_developer;
     private string raw_assoc;
-    private MapWidget map_widget;
 
     public BasicProperties() {
         base();
-
-        map_widget = MapWidget.get_instance();
-        pack_end(map_widget, true, true, 0);
     }
 
     protected override void clear_properties() {
@@ -464,8 +460,6 @@ private class BasicProperties : Properties {
                 }
             }
         }
-
-        map_widget.set_page(page);
     }
 }
 
diff --git a/src/Resources.vala b/src/Resources.vala
index 86f0eb65..58283618 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -1068,27 +1068,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
 
         return (scale > 0) ? scale_pixbuf(pixbuf, scale, Gdk.InterpType.BILINEAR, false) : pixbuf;
     }
-    
-    // Helper method for loading the result of get_icon into a Clutter.Image
-    // Returns null on error, in which case width and height are set to 0.
-    public static Clutter.Image? get_icon_as_clutter_image(string name, out float width, out float height) {
-        Gdk.Pixbuf pixbuf = Resources.get_icon(name);
-        Clutter.Image clutter_image = new Clutter.Image();
-        try {
-            clutter_image.set_data(pixbuf.get_pixels(),
-                pixbuf.get_has_alpha() ? Cogl.PixelFormat.RGBA_8888 : Cogl.PixelFormat.RGB_888,
-                pixbuf.get_width(),
-                pixbuf.get_height(),
-                pixbuf.get_rowstride());
-            width = pixbuf.get_width();
-            height = pixbuf.get_height();
-        } catch (GLib.Error e) {
-            width = 0;
-            height = 0;
-            return null;
-        }
-        return clutter_image;
-    }
 
     // Get the directory where our help files live.  Returns a string
     // describing the help path we want, or, if we're installed system
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index ad568856..4eac314f 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -280,7 +280,6 @@ public class LibraryWindow : AppWindow {
         { "CommonDisplaySearchbar", null, null, "false", on_display_searchbar },
         { "CommonDisplaySidebar", on_action_toggle, null, "true", on_display_sidebar },
         { "CommonDisplayToolbar", null, null, "true", on_display_toolbar },
-        { "CommonDisplayMap", on_action_toggle, null, "true", on_display_map_widget },
 
         { "CommonSortEvents", on_action_radio, "s", "'ascending'", on_events_sort_changed }
     };
@@ -293,7 +292,6 @@ public class LibraryWindow : AppWindow {
         lookup_action ("CommonDisplaySearchbar").change_state 
(Config.Facade.get_instance().get_display_search_bar());
         lookup_action ("CommonDisplaySidebar").change_state (is_sidebar_visible ());
         lookup_action ("CommonDisplayToolbar").change_state (is_toolbar_visible ());
-        lookup_action ("CommonDisplayMap").change_state (is_map_widget_visible ());
     }
 
     protected override void switched_pages(Page? old_page, Page? new_page) {
@@ -753,21 +751,6 @@ public class LibraryWindow : AppWindow {
         return Config.Facade.get_instance ().get_display_toolbar ();
     }
 
-    private void on_display_map_widget (GLib.SimpleAction action, Variant variant) {
-        set_map_widget_visible (variant.get_boolean ());
-
-        action.set_state (variant);
-    }
-
-    private void set_map_widget_visible(bool visible) {
-        MapWidget.get_instance().set_visible(visible);
-        Config.Facade.get_instance().set_display_map_widget(visible);
-    }
-
-    private bool is_map_widget_visible() {
-        return Config.Facade.get_instance().get_display_map_widget();
-    }
-
     public void enqueue_batch_import(BatchImport batch_import, bool allow_user_cancel) {
         library_branch.import_queue_entry.enqueue_and_schedule(batch_import, allow_user_cancel);
     }
diff --git a/src/main.vala b/src/main.vala
index f5365211..014b0b54 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -384,7 +384,7 @@ void main(string[] args) {
 
     // init GTK (valac has already called g_threads_init())
     try {
-        GtkClutter.init_with_args(ref args, _("[FILE]"), CommandlineOptions.entries,
+        Gtk.init_with_args(ref args, _("[FILE]"), CommandlineOptions.entries,
             Resources.APP_GETTEXT_PACKAGE);
 
     } catch (Error e) {
diff --git a/src/meson.build b/src/meson.build
index 8b1ab4b5..14b63299 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -37,8 +37,7 @@ endif
 
 shotwell_deps = [gio, gee, sqlite, gtk, sqlite, posix, gphoto2,
                  gstreamer_pbu, gio_unix, gudev, gexiv2, gmodule, unity,
-                 libraw, libexif, sw_plugin, webpdemux, webp, version,
-                 clutter, clutter_gtk, champlain, champlain_gtk, gdk]
+                 libraw, libexif, sw_plugin, webpdemux, webp, version, gdk ]
 
 subdir('metadata')
 subdir('publishing')
@@ -193,7 +192,6 @@ executable(
         'Box.vala',
         'Photo.vala',
         'Orientation.vala',
-        'MapWidget.vala',
         'BatchImport.vala',
         'Dialogs.vala',
         'Resources.vala',
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]