diff options
| author | Michael Engber <engber@eazel.com> | 2000-06-23 01:39:59 +0000 |
|---|---|---|
| committer | Mike Engber <engber@src.gnome.org> | 2000-06-23 01:39:59 +0000 |
| commit | 610c3c77eec164f87267287915c186cb8cf6579c (patch) | |
| tree | 8227bc81093ebea623d34c158e3e1767ce682042 /libnautilus | |
| parent | 29cfbcff0f06d4312d0525d2a99668e83ba7c7be (diff) | |
| download | nautilus-610c3c77eec164f87267287915c186cb8cf6579c.tar.gz | |
Removed zoom_to_level from the zoomable interface - starting on the
2000-06-22 Michael Engber <engber@eazel.com>
* libnautilus/nautilus-view-component.idl:
* libnautilus/nautilus-zoomable.c:
(nautilus_zoomable_initialize_class):
* src/file-manager/fm-directory-view.c:
(fm_directory_view_initialize), (nautilus_zoom_level_from_double),
(zoomable_set_zoom_level_callback):
* src/nautilus-view-frame.c:
* src/nautilus-view-frame.h:
* src/nautilus-window.c: (zoom_to_level_callback):
* src/nautilus-zoom-control.c:
(nautilus_zoom_control_class_initialize), (zoom_menu_callback),
(zoom_menu_item_free_zoom_level), (create_zoom_menu_item),
(create_zoom_menu):
Removed zoom_to_level from the zoomable interface - starting
on the process of removing the zoom control being tied to
7 discrete icon sizes. Bug #1425
Diffstat (limited to 'libnautilus')
| -rw-r--r-- | libnautilus/nautilus-view-component.idl | 3 | ||||
| -rw-r--r-- | libnautilus/nautilus-zoomable.c | 23 |
2 files changed, 1 insertions, 25 deletions
diff --git a/libnautilus/nautilus-view-component.idl b/libnautilus/nautilus-view-component.idl index 39384c337..f1196fd32 100644 --- a/libnautilus/nautilus-view-component.idl +++ b/libnautilus/nautilus-view-component.idl @@ -105,7 +105,7 @@ module Nautilus { readonly attribute double max_zoom_level; readonly attribute boolean is_continuous; /* FIXME: Implement "preferred zoom levels" or delete. */ - // readonly attribute ZoomLevelList preferred_zoom_levels; + /* readonly attribute ZoomLevelList preferred_zoom_levels; */ /* High level operations. * These can cause a change in the zoom level. @@ -114,7 +114,6 @@ module Nautilus { */ oneway void zoom_in (); oneway void zoom_out (); - oneway void zoom_to_level (in short zoom_level); oneway void zoom_default (); /* FIXME: Implement "zoom to fit" or delete. */ oneway void zoom_to_fit (); diff --git a/libnautilus/nautilus-zoomable.c b/libnautilus/nautilus-zoomable.c index 0d7b4c23e..6be65ffbe 100644 --- a/libnautilus/nautilus-zoomable.c +++ b/libnautilus/nautilus-zoomable.c @@ -50,7 +50,6 @@ enum { SET_ZOOM_LEVEL, ZOOM_IN, ZOOM_OUT, - ZOOM_TO_LEVEL, ZOOM_DEFAULT, ZOOM_TO_FIT, LAST_SIGNAL @@ -91,9 +90,6 @@ static void impl_Nautilus_Zoomable_zoom_in (impl_POA_Nautil CORBA_Environment *ev); static void impl_Nautilus_Zoomable_zoom_out (impl_POA_Nautilus_Zoomable *servant, CORBA_Environment *ev); -static void impl_Nautilus_Zoomable_zoom_to_level (impl_POA_Nautilus_Zoomable *servant, - const gint level, - CORBA_Environment *ev); static void impl_Nautilus_Zoomable_zoom_default (impl_POA_Nautilus_Zoomable *servant, CORBA_Environment *ev); static void impl_Nautilus_Zoomable_zoom_to_fit (impl_POA_Nautilus_Zoomable *servant, @@ -109,7 +105,6 @@ POA_Nautilus_Zoomable__epv libnautilus_Nautilus_Zoomable_epv = (gpointer) &impl_Nautilus_Zoomable__get_is_continuous, (gpointer) &impl_Nautilus_Zoomable_zoom_in, (gpointer) &impl_Nautilus_Zoomable_zoom_out, - (gpointer) &impl_Nautilus_Zoomable_zoom_to_level, (gpointer) &impl_Nautilus_Zoomable_zoom_default, (gpointer) &impl_Nautilus_Zoomable_zoom_to_fit }; @@ -173,14 +168,6 @@ impl_Nautilus_Zoomable_zoom_out (impl_POA_Nautilus_Zoomable *servant, } static void -impl_Nautilus_Zoomable_zoom_to_level (impl_POA_Nautilus_Zoomable *servant, - const gint level, - CORBA_Environment *ev) -{ - gtk_signal_emit (GTK_OBJECT (servant->gtk_object), signals[ZOOM_TO_LEVEL], level); -} - -static void impl_Nautilus_Zoomable_zoom_default (impl_POA_Nautilus_Zoomable *servant, CORBA_Environment *ev) { @@ -302,16 +289,6 @@ nautilus_zoomable_initialize_class (NautilusZoomableClass *klass) GTK_SIGNAL_OFFSET (NautilusZoomableClass, zoom_out), gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); - signals[ZOOM_TO_LEVEL] = - gtk_signal_new ("zoom_to_level", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusZoomableClass, zoom_to_level), - gtk_marshal_NONE__INT, - GTK_TYPE_NONE, - 1, - GTK_TYPE_INT); - signals[ZOOM_DEFAULT] = gtk_signal_new ("zoom_default", GTK_RUN_LAST, |