GNOME.org
 

[gthumb] removed shrink wrap

commit bce7de5b8c6794f4300452cd21cfddb6612fec47
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Nov 3 18:02:28 2013 +0100

    removed shrink wrap

 data/org.gnome.gthumb.gschema.xml.in               |    4 -
 extensions/file_viewer/gth-file-viewer-page.c      |   11 --
 extensions/gstreamer_tools/gth-media-viewer-page.c |   15 ---
 extensions/image_viewer/gth-image-viewer-page.c    |   23 ++---
 gthumb/gth-browser-actions-callbacks.c             |   10 --
 gthumb/gth-browser-actions-callbacks.h             |    1 -
 gthumb/gth-browser-actions-entries.h               |    2 -
 gthumb/gth-browser.c                               |  105 --------------------
 gthumb/gth-browser.h                               |    3 -
 gthumb/gth-preferences.h                           |    1 -
 gthumb/gth-viewer-page.c                           |   11 --
 gthumb/gth-viewer-page.h                           |    8 --
 gthumb/resources/file-menu.ui                      |    5 -
 13 files changed, 8 insertions(+), 191 deletions(-)
---
diff --git a/data/org.gnome.gthumb.gschema.xml.in b/data/org.gnome.gthumb.gschema.xml.in
index 5f38cad..56b1b15 100644
--- a/data/org.gnome.gthumb.gschema.xml.in
+++ b/data/org.gnome.gthumb.gschema.xml.in
@@ -131,10 +131,6 @@
     <key name="viewer-thumbnails-orientation" enum="org.gnome.gthumb.GtkOrientation">
       <default>'horizontal'</default>
     </key>
-    <key name="shrink-wrap-viewer" type="b">
-      <default>false</default>
-      <_description>Whether to resize the window to fit the size of the image</_description>
-    </key>
     <key name="reuse-active-window" type="b">
       <default>false</default>
       <_description>Open files in the active window</_description>
diff --git a/extensions/file_viewer/gth-file-viewer-page.c b/extensions/file_viewer/gth-file-viewer-page.c
index 3f8db53..ca4a37d 100644
--- a/extensions/file_viewer/gth-file-viewer-page.c
+++ b/extensions/file_viewer/gth-file-viewer-page.c
@@ -304,16 +304,6 @@ gth_file_viewer_page_real_update_info (GthViewerPage *base,
 
 
 static void
-gth_file_viewer_page_real_shrink_wrap (GthViewerPage *base,
-                                      gboolean       value,
-                                      int           *other_width,
-                                      int           *other_height)
-{
-       /* void */
-}
-
-
-static void
 gth_file_viewer_page_finalize (GObject *obj)
 {
        GthFileViewerPage *self;
@@ -350,7 +340,6 @@ gth_viewer_page_interface_init (GthViewerPageInterface *iface)
        iface->update_sensitivity = gth_file_viewer_page_real_update_sensitivity;
        iface->can_save = gth_file_viewer_page_real_can_save;
        iface->update_info = gth_file_viewer_page_real_update_info;
-       iface->shrink_wrap = gth_file_viewer_page_real_shrink_wrap;
 }
 
 
diff --git a/extensions/gstreamer_tools/gth-media-viewer-page.c 
b/extensions/gstreamer_tools/gth-media-viewer-page.c
index e6155ab..8b3f113 100644
--- a/extensions/gstreamer_tools/gth-media-viewer-page.c
+++ b/extensions/gstreamer_tools/gth-media-viewer-page.c
@@ -1348,20 +1348,6 @@ gth_media_viewer_page_real_update_info (GthViewerPage *base,
 
 
 static void
-gth_media_viewer_page_real_shrink_wrap (GthViewerPage *base,
-                                       gboolean       value,
-                                       int           *other_width,
-                                       int           *other_height)
-{
-       GthMediaViewerPage *self = GTH_MEDIA_VIEWER_PAGE (base);
-
-       if (! value || (other_width == NULL) || (other_height == NULL))
-               return;
-       *other_height += _gtk_widget_get_allocated_height (self->priv->mediabar);
-}
-
-
-static void
 gth_media_viewer_page_finalize (GObject *obj)
 {
        GthMediaViewerPage *self;
@@ -1422,7 +1408,6 @@ gth_viewer_page_interface_init (GthViewerPageInterface *iface)
        iface->save_as = gth_media_viewer_page_real_save_as;
        iface->revert = gth_media_viewer_page_real_revert;
        iface->update_info = gth_media_viewer_page_real_update_info;
-       iface->shrink_wrap = gth_media_viewer_page_real_shrink_wrap;
 }
 
 
diff --git a/extensions/image_viewer/gth-image-viewer-page.c b/extensions/image_viewer/gth-image-viewer-page.c
index 3622437..9d47258 100644
--- a/extensions/image_viewer/gth-image-viewer-page.c
+++ b/extensions/image_viewer/gth-image-viewer-page.c
@@ -1419,27 +1419,21 @@ gth_image_viewer_page_real_show_properties (GthViewerPage *base,
 
 
 static void
-gth_image_viewer_page_real_shrink_wrap (GthViewerPage *base,
-                                       gboolean       activate,
-                                       int           *other_width,
-                                       int           *other_height)
-{
-       GthImageViewerPage *self = GTH_IMAGE_VIEWER_PAGE (base);
-       gth_image_viewer_set_fit_mode (GTH_IMAGE_VIEWER (self->priv->viewer), GTH_FIT_SIZE_IF_LARGER);
-}
-
-
-static void
 gth_image_viewer_page_finalize (GObject *obj)
 {
        GthImageViewerPage *self;
 
        self = GTH_IMAGE_VIEWER_PAGE (obj);
 
-       if (self->priv->update_quality_event != 0) {
-               g_source_remove (self->priv->update_quality_event);
-               self->priv->update_quality_event = 0;
+       if (self->priv->update_quality_id != 0) {
+               g_source_remove (self->priv->update_quality_id);
+               self->priv->update_quality_id = 0;
+       }
+       if (self->priv->update_visibility_id != 0) {
+               g_source_remove (self->priv->update_visibility_id);
+               self->priv->update_visibility_id = 0;
        }
+
        g_object_unref (self->priv->settings);
        g_object_unref (self->priv->history);
        _g_object_unref (self->priv->file_data);
@@ -1477,7 +1471,6 @@ gth_viewer_page_interface_init (GthViewerPageInterface *iface)
        iface->revert = gth_image_viewer_page_real_revert;
        iface->update_info = gth_image_viewer_page_real_update_info;
        iface->show_properties = gth_image_viewer_page_real_show_properties;
-       iface->shrink_wrap = gth_image_viewer_page_real_shrink_wrap;
 }
 
 
diff --git a/gthumb/gth-browser-actions-callbacks.c b/gthumb/gth-browser-actions-callbacks.c
index cb84a25..b83a986 100644
--- a/gthumb/gth-browser-actions-callbacks.c
+++ b/gthumb/gth-browser-actions-callbacks.c
@@ -443,16 +443,6 @@ gth_browser_activate_open_folder_in_new_window (GSimpleAction *action,
 
 
 void
-gth_browser_activate_shrink_wrap (GSimpleAction *action,
-                                 GVariant      *state,
-                                 gpointer       user_data)
-{
-       g_simple_action_set_state (action, state);
-       gth_browser_set_shrink_wrap_viewer (GTH_BROWSER (user_data), g_variant_get_boolean (state));
-}
-
-
-void
 gth_browser_activate_show_hidden_files (GSimpleAction *action,
                                        GVariant      *state,
                                        gpointer       user_data)
diff --git a/gthumb/gth-browser-actions-callbacks.h b/gthumb/gth-browser-actions-callbacks.h
index db0fd88..0ba1ccb 100644
--- a/gthumb/gth-browser-actions-callbacks.h
+++ b/gthumb/gth-browser-actions-callbacks.h
@@ -52,7 +52,6 @@ DEF_ACTION_CALLBACK (gth_browser_activate_viewer_edit_file)
 DEF_ACTION_CALLBACK (gth_browser_activate_viewer_properties)
 DEF_ACTION_CALLBACK (gth_browser_activate_unfullscreen)
 DEF_ACTION_CALLBACK (gth_browser_activate_open_folder_in_new_window)
-DEF_ACTION_CALLBACK (gth_browser_activate_shrink_wrap)
 DEF_ACTION_CALLBACK (gth_browser_activate_show_hidden_files)
 DEF_ACTION_CALLBACK (gth_browser_activate_show_thumbnails)
 DEF_ACTION_CALLBACK (gth_browser_activate_sort_by)
diff --git a/gthumb/gth-browser-actions-entries.h b/gthumb/gth-browser-actions-entries.h
index 28cbc17..148163b 100644
--- a/gthumb/gth-browser-actions-entries.h
+++ b/gthumb/gth-browser-actions-entries.h
@@ -49,7 +49,6 @@ static const GActionEntry gth_browser_actions[] = {
        { "viewer-properties", toggle_action_activated, NULL, "false", gth_browser_activate_viewer_properties 
},
        { "unfullscreen", gth_browser_activate_unfullscreen },
        { "open-folder-in-new-window", gth_browser_activate_open_folder_in_new_window },
-       { "shrink-wrap", toggle_action_activated, NULL, "false", gth_browser_activate_shrink_wrap },
 
        { "show-hidden-files", toggle_action_activated, NULL, "false", gth_browser_activate_show_hidden_files 
},
        { "show-thumbnails", toggle_action_activated, NULL, "false", gth_browser_activate_show_thumbnails },
@@ -69,7 +68,6 @@ static const GthAccelerator gth_browser_accelerators[] = {
        { "revert-to-saved", "F4" },
        { "show-sidebar", "F9" },
        { "show-thumbnail-list", "F8" },
-       { "shrink-wrap", "<Control>e" }
 };
 
 
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index b1c606a..7a59de0 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -173,7 +173,6 @@ struct _GthBrowserPrivate {
        gboolean           properties_on_screen;
        char              *location_free_space;
        gboolean           recalc_location_free_space;
-       gboolean           shrink_wrap_viewer;
        gboolean           file_properties_on_the_right;
        GthSidebarState    viewer_sidebar;
        BrowserState       state;
@@ -3742,7 +3741,6 @@ gth_browser_init (GthBrowser *browser)
        browser->priv->last_mouse_y = 0.0;
        browser->priv->history = NULL;
        browser->priv->history_current = NULL;
-       browser->priv->shrink_wrap_viewer = FALSE;
        browser->priv->browser_settings = g_settings_new (GTHUMB_BROWSER_SCHEMA);
        browser->priv->messages_settings = g_settings_new (GTHUMB_MESSAGES_SCHEMA);
        browser->priv->desktop_interface_settings = g_settings_new (GNOME_DESKTOP_INTERFACE_SCHEMA);
@@ -4342,9 +4340,6 @@ gth_browser_init (GthBrowser *browser)
        browser->priv->show_hidden_files = g_settings_get_boolean (browser->priv->browser_settings, 
PREF_BROWSER_SHOW_HIDDEN_FILES);
        gth_window_change_action_state (GTH_WINDOW (browser), "show-hidden-files", 
browser->priv->show_hidden_files);
 
-       browser->priv->shrink_wrap_viewer = g_settings_get_boolean (browser->priv->browser_settings, 
PREF_BROWSER_SHRINK_WRAP_VIEWER);
-       gth_window_change_action_state (GTH_WINDOW (browser), "shrink-wrap", 
browser->priv->shrink_wrap_viewer);
-
        if (g_settings_get_boolean (browser->priv->browser_settings, PREF_BROWSER_PROPERTIES_VISIBLE))
                gth_browser_show_file_properties (browser);
        else
@@ -5521,17 +5516,6 @@ gth_viewer_page_file_loaded_cb (GthViewerPage *viewer_page,
 
        g_file_info_set_attribute_boolean (browser->priv->current_file->info, "gth::file::is-modified", 
FALSE);
 
-       if (browser->priv->shrink_wrap_viewer) {
-               /* the frame::[width|height] properties have been set by the
-                * viewer, copy them in the current file. */
-
-               g_file_info_set_attribute_int32 (browser->priv->current_file->info, "frame::width",
-                                                g_file_info_get_attribute_int32 (file_data->info, 
"frame::width"));
-               g_file_info_set_attribute_int32 (browser->priv->current_file->info, "frame::height",
-                                                g_file_info_get_attribute_int32 (file_data->info, 
"frame::height"));
-               gth_browser_set_shrink_wrap_viewer (browser, TRUE);
-       }
-
        if (browser->priv->load_metadata_timeout != 0)
                g_source_remove (browser->priv->load_metadata_timeout);
 
@@ -5759,95 +5743,6 @@ gth_browser_hide_sidebar (GthBrowser *browser)
 }
 
 
-void
-gth_browser_set_shrink_wrap_viewer (GthBrowser *browser,
-                                   gboolean    value)
-{
-       int        width;
-       int        height;
-       double     ratio;
-       int        other_width;
-       int        other_height;
-       GdkScreen *screen;
-       int        max_width;
-       int        max_height;
-
-       browser->priv->shrink_wrap_viewer = value;
-       g_settings_set_boolean (browser->priv->browser_settings, PREF_BROWSER_SHRINK_WRAP_VIEWER, 
browser->priv->shrink_wrap_viewer);
-
-       if (browser->priv->viewer_page == NULL)
-               return;
-
-       if (! browser->priv->shrink_wrap_viewer) {
-               if (gth_window_get_page_size (GTH_WINDOW (browser),
-                                             GTH_BROWSER_PAGE_BROWSER,
-                                             &width,
-                                             &height))
-               {
-                       gth_window_save_page_size (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER, width, 
height);
-                       gth_window_apply_saved_size (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER);
-               }
-               else
-                       gth_window_clear_saved_size (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER);
-               gth_viewer_page_shrink_wrap (browser->priv->viewer_page, FALSE, NULL, NULL);
-
-               return;
-       }
-
-       if (browser->priv->current_file == NULL)
-               return;
-
-       width = g_file_info_get_attribute_int32 (browser->priv->current_file->info, "frame::width");
-       height = g_file_info_get_attribute_int32 (browser->priv->current_file->info, "frame::height");
-       if ((width <= 0) || (height <= 0))
-               return;
-
-       ratio = (double) width / height;
-
-       other_width = 0;
-       other_height = 0;
-       other_height += _gtk_widget_get_allocated_height (gth_window_get_area (GTH_WINDOW (browser), 
GTH_WINDOW_MENUBAR));
-       other_height += _gtk_widget_get_allocated_height (gth_window_get_area (GTH_WINDOW (browser), 
GTH_WINDOW_STATUSBAR));
-       if (g_settings_get_enum (browser->priv->browser_settings, PREF_BROWSER_VIEWER_THUMBNAILS_ORIENT) == 
GTK_ORIENTATION_HORIZONTAL)
-               other_height += _gtk_widget_get_allocated_height (gth_browser_get_thumbnail_list (browser));
-       else
-               other_width += _gtk_widget_get_allocated_width (gth_browser_get_thumbnail_list (browser));
-       other_width += _gtk_widget_get_allocated_width (gth_browser_get_viewer_sidebar (browser));
-       other_width += 2;
-       other_height += 2;
-
-       gth_viewer_page_shrink_wrap (browser->priv->viewer_page, TRUE, &other_width, &other_height);
-
-       screen = gtk_widget_get_screen (GTK_WIDGET (browser));
-       max_width = gdk_screen_get_width (screen) - SHIRNK_WRAP_WIDTH_OFFSET;
-       max_height = gdk_screen_get_height (screen)- SHIRNK_WRAP_HEIGHT_OFFSET;
-
-       if (width + other_width > max_width) {
-               width = max_width - other_width;
-               height = width / ratio;
-       }
-
-       if (height + other_height > max_height) {
-               height = max_height - other_height;
-               width = height * ratio;
-       }
-
-       gth_window_save_page_size (GTH_WINDOW (browser),
-                                  GTH_BROWSER_PAGE_VIEWER,
-                                  width + other_width,
-                                  height + other_height);
-       if (gth_window_get_current_page (GTH_WINDOW (browser)) == GTH_BROWSER_PAGE_VIEWER)
-               gth_window_apply_saved_size (GTH_WINDOW (browser), GTH_BROWSER_PAGE_VIEWER);
-}
-
-
-gboolean
-gth_browser_get_shrink_wrap_viewer (GthBrowser *browser)
-{
-       return browser->priv->shrink_wrap_viewer;
-}
-
-
 /* -- gth_browser_load_location -- */
 
 
diff --git a/gthumb/gth-browser.h b/gthumb/gth-browser.h
index 253ec29..98eb2d1 100644
--- a/gthumb/gth-browser.h
+++ b/gthumb/gth-browser.h
@@ -225,9 +225,6 @@ void             gth_browser_update_statusbar_file_info
 void             gth_browser_show_file_properties   (GthBrowser       *browser);
 void             gth_browser_show_viewer_tools      (GthBrowser       *browser);
 void             gth_browser_hide_sidebar           (GthBrowser       *browser);
-void             gth_browser_set_shrink_wrap_viewer (GthBrowser       *browser,
-                                                    gboolean          value);
-gboolean         gth_browser_get_shrink_wrap_viewer (GthBrowser       *browser);
 void             gth_browser_load_location          (GthBrowser       *browser,
                                                     GFile            *location);
 void             gth_browser_enable_thumbnails      (GthBrowser       *browser,
diff --git a/gthumb/gth-preferences.h b/gthumb/gth-preferences.h
index c3e79c2..59a2216 100644
--- a/gthumb/gth-preferences.h
+++ b/gthumb/gth-preferences.h
@@ -78,7 +78,6 @@ G_BEGIN_DECLS
 #define PREF_BROWSER_VIEWER_SIDEBAR           "viewer-sidebar"
 #define PREF_BROWSER_VIEWER_SIDEBAR_WIDTH     "viewer-sidebar-width"
 #define PREF_BROWSER_VIEWER_THUMBNAILS_ORIENT "viewer-thumbnails-orientation"
-#define PREF_BROWSER_SHRINK_WRAP_VIEWER       "shrink-wrap-viewer"
 #define PREF_BROWSER_REUSE_ACTIVE_WINDOW      "reuse-active-window"
 
 /* keys: add to catalog */
diff --git a/gthumb/gth-viewer-page.c b/gthumb/gth-viewer-page.c
index 0c5c5a0..0dfb828 100644
--- a/gthumb/gth-viewer-page.c
+++ b/gthumb/gth-viewer-page.c
@@ -191,17 +191,6 @@ gth_viewer_page_show_properties (GthViewerPage *self,
 
 
 void
-gth_viewer_page_shrink_wrap (GthViewerPage *self,
-                            gboolean       value,
-                            int           *other_width,
-                            int           *other_height)
-{
-       if (GTH_VIEWER_PAGE_GET_INTERFACE (self)->shrink_wrap != NULL)
-               GTH_VIEWER_PAGE_GET_INTERFACE (self)->shrink_wrap (self, value, other_width, other_height);
-}
-
-
-void
 gth_viewer_page_file_loaded (GthViewerPage *self,
                             GthFileData   *file_data,
                             gboolean       success)
diff --git a/gthumb/gth-viewer-page.h b/gthumb/gth-viewer-page.h
index 121fa1f..9e912ab 100644
--- a/gthumb/gth-viewer-page.h
+++ b/gthumb/gth-viewer-page.h
@@ -74,10 +74,6 @@ struct _GthViewerPageInterface {
                                          GthFileData   *file_data);
        void      (*show_properties)     (GthViewerPage *self,
                                          gboolean       show);
-       void      (*shrink_wrap)         (GthViewerPage *self,
-                                         gboolean       show,
-                                         int           *other_width,
-                                         int           *other_height);
 
        /*< signals >*/
 
@@ -115,10 +111,6 @@ void         gth_viewer_page_update_info         (GthViewerPage  *self,
                                                  GthFileData    *file_data);
 void         gth_viewer_page_show_properties     (GthViewerPage  *self,
                                                  gboolean        show);
-void         gth_viewer_page_shrink_wrap         (GthViewerPage  *self,
-                                                 gboolean        show,
-                                                 int            *other_width,
-                                                 int            *other_height);
 void         gth_viewer_page_file_loaded         (GthViewerPage  *self,
                                                  GthFileData    *file_data,
                                                  gboolean        success);
diff --git a/gthumb/resources/file-menu.ui b/gthumb/resources/file-menu.ui
index d784c45..76e11a9 100644
--- a/gthumb/resources/file-menu.ui
+++ b/gthumb/resources/file-menu.ui
@@ -12,11 +12,6 @@
     <section id="open-actions">
     </section>
     <section id="view-actions">
-      <item>
-        <attribute name="label" translatable="yes">_Fit Window to Image</attribute>
-        <attribute name="action">win.shrink-wrap</attribute>
-        <attribute name="accel"><![CDATA[<Ctrl>e]]></attribute>
-      </item>
     </section>
     <section id="edit-actions">
     </section>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]