gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-19 15:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed zoom_to_default and zoom_parameters_changed. The nautilus-window

Browse source 
* libnautilus/nautilus-view-component.idl:
	* libnautilus/nautilus-zoomable.c:
	(impl_Nautilus_Zoomable__get_is_continuous),
	(nautilus_zoomable_initialize_class), (nautilus_zoomable_get_arg),
	(nautilus_zoomable_ensure_zoomable_frame):
	* src/file-manager/fm-directory-view.c:
	(fm_directory_view_initialize), (zoomable_zoom_to_fit_callback),
	(fm_directory_view_set_zoom_level):
	* src/file-manager/fm-directory-view.h:
	* src/file-manager/fm-icon-view.c: (fm_icon_view_begin_loading),
	(fm_icon_view_set_zoom_level), (fm_icon_view_bump_zoom_level),
	(fm_icon_view_zoom_to_level),
	(fm_icon_view_restore_default_zoom_level):
	* src/file-manager/fm-list-view.c: (fm_list_view_bump_zoom_level),
	(fm_list_view_zoom_to_level),
	(fm_list_view_restore_default_zoom_level),
	(fm_list_view_begin_loading), (fm_list_view_set_zoom_level):
	* src/nautilus-view-frame.c:
	(nautilus_view_frame_initialize_class),
	(nautilus_view_frame_zoom_level_changed):
	* src/nautilus-view-frame.h:
	* src/nautilus-window.c: (zoom_to_fit_callback),
	(nautilus_window_constructed),
	(nautilus_window_zoom_level_changed_callback),
	(nautilus_window_connect_view):
	* src/nautilus-zoom-control.c:
	(nautilus_zoom_control_class_initialize),
	(nautilus_zoom_control_initialize),
	(nautilus_zoom_control_button_press_event):
	* src/nautilus-zoom-control.h:
	* src/nautilus-zoomable-frame-corba.c:
	(impl_Nautilus_ZoomableFrame_report_zoom_level_changed):
	Removed zoom_to_default and zoom_parameters_changed.
	The nautilus-window now queries the zoomable for max
	and min before showing the zoom control.
This commit is contained in:
Mike Engber 2000-06-27 21:48:40 +00:00
parent a6901f1f3e
commit 888d3716f9
16 changed files with 117 additions and 331 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ChangeLog
View file

@ -1,3 +1,41 @@
2000-06-27 Michael Engber <engber@eazel.com>
* libnautilus/nautilus-view-component.idl:
* libnautilus/nautilus-zoomable.c:
(impl_Nautilus_Zoomable__get_is_continuous),
(nautilus_zoomable_initialize_class), (nautilus_zoomable_get_arg),
(nautilus_zoomable_ensure_zoomable_frame):
* src/file-manager/fm-directory-view.c:
(fm_directory_view_initialize), (zoomable_zoom_to_fit_callback),
(fm_directory_view_set_zoom_level):
* src/file-manager/fm-directory-view.h:
* src/file-manager/fm-icon-view.c: (fm_icon_view_begin_loading),
(fm_icon_view_set_zoom_level), (fm_icon_view_bump_zoom_level),
(fm_icon_view_zoom_to_level),
(fm_icon_view_restore_default_zoom_level):
* src/file-manager/fm-list-view.c: (fm_list_view_bump_zoom_level),
(fm_list_view_zoom_to_level),
(fm_list_view_restore_default_zoom_level),
(fm_list_view_begin_loading), (fm_list_view_set_zoom_level):
* src/nautilus-view-frame.c:
(nautilus_view_frame_initialize_class),
(nautilus_view_frame_zoom_level_changed):
* src/nautilus-view-frame.h:
* src/nautilus-window.c: (zoom_to_fit_callback),
(nautilus_window_constructed),
(nautilus_window_zoom_level_changed_callback),
(nautilus_window_connect_view):
* src/nautilus-zoom-control.c:
(nautilus_zoom_control_class_initialize),
(nautilus_zoom_control_initialize),
(nautilus_zoom_control_button_press_event):
* src/nautilus-zoom-control.h:
* src/nautilus-zoomable-frame-corba.c:
(impl_Nautilus_ZoomableFrame_report_zoom_level_changed):
Removed zoom_to_default and zoom_parameters_changed.
The nautilus-window now queries the zoomable for max
and min before showing the zoom control.
2000-06-27 J Shane Culpepper <pepper@eazel.com>
* components/rpmview/Makefile.am:

7
libnautilus/nautilus-view-component.idl
View file

@ -110,12 +110,10 @@ module Nautilus {
/* High level operations.
* These can cause a change in the zoom level.
* The zoomable itself must decide what the concepts
* "one level in", "one level out", "default" and "to fit" mean.
* "one level in", "one level out", and "to fit" mean.
*/
oneway void zoom_in ();
oneway void zoom_out ();
oneway void zoom_default ();
/* FIXME: Implement "zoom to fit" or delete. */
oneway void zoom_to_fit ();
};
@ -127,9 +125,6 @@ module Nautilus {
interface ZoomableFrame : ::Bonobo::Unknown {
oneway void report_zoom_level_changed (in double zoom_level);
oneway void report_zoom_parameters_changed (in double zoom_level,
in double min_zoom_level,
in double max_zoom_level);
};
};

58
libnautilus/nautilus-zoomable.c
View file

@ -50,7 +50,6 @@ enum {
SET_ZOOM_LEVEL,
ZOOM_IN,
ZOOM_OUT,
ZOOM_DEFAULT,
ZOOM_TO_FIT,
LAST_SIGNAL
};
@ -60,7 +59,7 @@ enum {
ARG_BONOBO_CONTROL,
ARG_MIN_ZOOM_LEVEL,
ARG_MAX_ZOOM_LEVEL,
ARG_IS_CONTINUOUS
ARG_IS_CONTINUOUS,
};
static guint signals[LAST_SIGNAL];
@ -84,14 +83,12 @@ static CORBA_double impl_Nautilus_Zoomable__get_min_zoom_level (impl_POA_Nautil
CORBA_Environment *ev);
static CORBA_double impl_Nautilus_Zoomable__get_max_zoom_level (impl_POA_Nautilus_Zoomable *servant,
CORBA_Environment *ev);
static CORBA_boolean impl_Nautilus_Zoomable__get_is_continuous (impl_POA_Nautilus_Zoomable *servant,
static CORBA_boolean impl_Nautilus_Zoomable__get_is_continuous (impl_POA_Nautilus_Zoomable *servant,
CORBA_Environment *ev);
static void impl_Nautilus_Zoomable_zoom_in (impl_POA_Nautilus_Zoomable *servant,
CORBA_Environment *ev);
static void impl_Nautilus_Zoomable_zoom_out (impl_POA_Nautilus_Zoomable *servant,
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,
CORBA_Environment *ev);
@ -105,7 +102,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_default,
(gpointer) &impl_Nautilus_Zoomable_zoom_to_fit
};
@ -148,7 +144,7 @@ impl_Nautilus_Zoomable__get_max_zoom_level (impl_POA_Nautilus_Zoomable *servant,
static CORBA_boolean
impl_Nautilus_Zoomable__get_is_continuous (impl_POA_Nautilus_Zoomable *servant,
CORBA_Environment *ev)
CORBA_Environment *ev)
{
return servant->gtk_object->details->is_continuous;
}
@ -167,14 +163,6 @@ impl_Nautilus_Zoomable_zoom_out (impl_POA_Nautilus_Zoomable *servant,
gtk_signal_emit (GTK_OBJECT (servant->gtk_object), signals[ZOOM_OUT]);
}
static void
impl_Nautilus_Zoomable_zoom_default (impl_POA_Nautilus_Zoomable *servant,
CORBA_Environment *ev)
{
gtk_signal_emit (GTK_OBJECT (servant->gtk_object), signals[ZOOM_DEFAULT]);
}
static void
impl_Nautilus_Zoomable_zoom_to_fit (impl_POA_Nautilus_Zoomable *servant,
CORBA_Environment *ev)
@ -289,13 +277,6 @@ nautilus_zoomable_initialize_class (NautilusZoomableClass *klass)
GTK_SIGNAL_OFFSET (NautilusZoomableClass, zoom_out),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[ZOOM_DEFAULT] =
gtk_signal_new ("zoom_default",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusZoomableClass, zoom_default),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[ZOOM_TO_FIT] =
gtk_signal_new ("zoom_to_fit",
GTK_RUN_LAST,
@ -371,7 +352,7 @@ nautilus_zoomable_get_arg (GtkObject *object,
GTK_VALUE_DOUBLE (*arg) = NAUTILUS_ZOOMABLE (object)->details->max_zoom_level;
break;
case ARG_IS_CONTINUOUS:
GTK_VALUE_DOUBLE (*arg) = NAUTILUS_ZOOMABLE (object)->details->is_continuous;
GTK_VALUE_BOOL (*arg) = NAUTILUS_ZOOMABLE (object)->details->is_continuous;
break;
}
}
@ -457,37 +438,6 @@ nautilus_zoomable_ensure_zoomable_frame (NautilusZoomable *view)
}
}
void
nautilus_zoomable_set_parameters (NautilusZoomable *view,
double zoom_level,
double min_zoom_level,
double max_zoom_level)
{
CORBA_Environment ev;
g_return_if_fail (NAUTILUS_IS_ZOOMABLE (view));
CORBA_exception_init (&ev);
view->details->zoom_level = zoom_level;
view->details->min_zoom_level = min_zoom_level;
view->details->max_zoom_level = max_zoom_level;
if (nautilus_zoomable_ensure_zoomable_frame (view)) {
Nautilus_ZoomableFrame_report_zoom_parameters_changed (view->details->zoomable_frame,
view->details->zoom_level,
view->details->min_zoom_level,
view->details->max_zoom_level,
&ev);
if (ev._major != CORBA_NO_EXCEPTION) {
CORBA_Object_release (view->details->zoomable_frame, &ev);
view->details->zoomable_frame = CORBA_OBJECT_NIL;
}
}
CORBA_exception_free (&ev);
}
void
nautilus_zoomable_set_zoom_level (NautilusZoomable *view,
double zoom_level)

26
src/file-manager/fm-directory-view.c
View file

@ -162,7 +162,7 @@ static void zoomable_zoom_in_callback
FMDirectoryView *directory_view);
static void zoomable_zoom_out_callback (NautilusZoomable *zoomable,
FMDirectoryView *directory_view);
static void zoomable_zoom_default_callback (NautilusZoomable *zoomable,
static void zoomable_zoom_to_fit_callback (NautilusZoomable *zoomable,
FMDirectoryView *directory_view);
static void schedule_idle_display_of_pending_files (FMDirectoryView *view);
static void unschedule_idle_display_of_pending_files (FMDirectoryView *view);
@ -731,8 +731,8 @@ fm_directory_view_initialize (FMDirectoryView *directory_view)
zoomable_set_zoom_level_callback,
directory_view);
gtk_signal_connect (GTK_OBJECT (directory_view->details->zoomable),
"zoom_default",
zoomable_zoom_default_callback,
"zoom_to_fit",
zoomable_zoom_to_fit_callback,
directory_view);
gtk_widget_show (GTK_WIDGET (directory_view));
@ -1090,9 +1090,12 @@ zoomable_set_zoom_level_callback (NautilusZoomable *zoomable, double level, FMDi
}
static void
zoomable_zoom_default_callback (NautilusZoomable *zoomable, FMDirectoryView *directory_view)
zoomable_zoom_to_fit_callback (NautilusZoomable *zoomable, FMDirectoryView *view)
{
fm_directory_view_restore_default_zoom_level (directory_view);
/* FIXME
* Need to really implement "zoom to fit"
*/
fm_directory_view_restore_default_zoom_level (view);
}
static gboolean
@ -1432,19 +1435,6 @@ fm_directory_view_set_zoom_level (FMDirectoryView *view, int zoom_level)
(double) nautilus_get_icon_size_for_zoom_level (zoom_level) / NAUTILUS_ICON_SIZE_STANDARD);
}
void
fm_directory_view_set_zoom_parameters (FMDirectoryView *view,
int zoom_level,
int min_zoom_level,
int max_zoom_level)
{
g_return_if_fail (FM_IS_DIRECTORY_VIEW (view));
nautilus_zoomable_set_parameters (view->details->zoomable,
(double) nautilus_get_icon_size_for_zoom_level (zoom_level) / NAUTILUS_ICON_SIZE_STANDARD,
(double) nautilus_get_icon_size_for_zoom_level (min_zoom_level) / NAUTILUS_ICON_SIZE_STANDARD,
(double) nautilus_get_icon_size_for_zoom_level (max_zoom_level) / NAUTILUS_ICON_SIZE_STANDARD);
}
/**
* fm_directory_view_restore_default_zoom_level:
*

4
src/file-manager/fm-directory-view.h
View file

@ -234,10 +234,6 @@ void fm_directory_view_zoom_to_level (FMDirectory
int zoom_level);
void fm_directory_view_set_zoom_level (FMDirectoryView *view,
int zoom_level);
void fm_directory_view_set_zoom_parameters (FMDirectoryView *view,
int zoom_level,
int min_zoom_level,
int max_zoom_level);
void fm_directory_view_restore_default_zoom_level (FMDirectoryView *view);
void fm_directory_view_select_all (FMDirectoryView *view);
void fm_directory_view_set_selection (FMDirectoryView *view,

32
src/file-manager/fm-icon-view.c
View file

@ -80,9 +80,7 @@ static void fm_icon_view_initialize (FMIconView
static void fm_icon_view_initialize_class (FMIconViewClass *klass);
static void fm_icon_view_set_zoom_level (FMIconView *view,
NautilusZoomLevel new_level,
gboolean notify_directory_view);
static void fm_icon_view_init_zoom_params (FMIconView *view,
NautilusZoomLevel zoom_level);
gboolean always_set_level);
static void text_attribute_names_changed_callback (gpointer user_data);
NAUTILUS_DEFINE_CLASS_BOILERPLATE (FMIconView, fm_icon_view, FM_TYPE_DIRECTORY_VIEW);
@ -646,7 +644,7 @@ fm_icon_view_begin_loading (FMDirectoryView *view)
(directory,
NAUTILUS_METADATA_KEY_ICON_VIEW_ZOOM_LEVEL,
icon_view->details->default_zoom_level);
fm_icon_view_init_zoom_params (icon_view, level);
fm_icon_view_set_zoom_level (icon_view, level, TRUE);
/* Set the sort mode from the metadata.
* It's OK not to resort the icons because the
@ -688,7 +686,7 @@ fm_icon_view_get_zoom_level (FMIconView *view)
static void
fm_icon_view_set_zoom_level (FMIconView *view,
NautilusZoomLevel new_level,
gboolean notify_directory_view)
gboolean always_set_level)
{
NautilusIconContainer *icon_container;
@ -698,6 +696,9 @@ fm_icon_view_set_zoom_level (FMIconView *view,
icon_container = get_icon_container (view);
if (nautilus_icon_container_get_zoom_level (icon_container) == new_level) {
if (always_set_level) {
fm_directory_view_set_zoom_level (&view->parent, new_level);
}
return;
}
@ -708,9 +709,7 @@ fm_icon_view_set_zoom_level (FMIconView *view,
new_level);
nautilus_icon_container_set_zoom_level (icon_container, new_level);
if (notify_directory_view) {
fm_directory_view_set_zoom_level (&view->parent, new_level);
}
fm_directory_view_set_zoom_level (&view->parent, new_level);
/* Reset default to new level; this way any change in zoom level
* will "stick" until the user visits a directory that had its zoom
@ -719,17 +718,6 @@ fm_icon_view_set_zoom_level (FMIconView *view,
view->details->default_zoom_level = new_level;
}
static void
fm_icon_view_init_zoom_params (FMIconView *view,
NautilusZoomLevel zoom_level)
{
fm_icon_view_set_zoom_level (view, zoom_level, FALSE);
fm_directory_view_set_zoom_parameters (&view->parent,
zoom_level,
NAUTILUS_ZOOM_LEVEL_SMALLEST,
NAUTILUS_ZOOM_LEVEL_LARGEST);
}
static void
fm_icon_view_bump_zoom_level (FMDirectoryView *view, int zoom_increment)
{
@ -740,7 +728,7 @@ fm_icon_view_bump_zoom_level (FMDirectoryView *view, int zoom_increment)
icon_view = FM_ICON_VIEW (view);
new_level = fm_icon_view_get_zoom_level (icon_view) + zoom_increment;
fm_icon_view_set_zoom_level(icon_view, new_level, TRUE);
fm_icon_view_set_zoom_level(icon_view, new_level, FALSE);
}
static void
@ -751,7 +739,7 @@ fm_icon_view_zoom_to_level (FMDirectoryView *view, int zoom_level)
g_return_if_fail (FM_IS_ICON_VIEW (view));
icon_view = FM_ICON_VIEW (view);
fm_icon_view_set_zoom_level(icon_view, zoom_level, TRUE);
fm_icon_view_set_zoom_level(icon_view, zoom_level, FALSE);
}
static void
@ -762,7 +750,7 @@ fm_icon_view_restore_default_zoom_level (FMDirectoryView *view)
g_return_if_fail (FM_IS_ICON_VIEW (view));
icon_view = FM_ICON_VIEW (view);
fm_icon_view_set_zoom_level(icon_view, NAUTILUS_ZOOM_LEVEL_STANDARD, TRUE);
fm_icon_view_set_zoom_level(icon_view, NAUTILUS_ZOOM_LEVEL_STANDARD, FALSE);
}
static gboolean

35
src/file-manager/fm-list-view.c
View file

@ -142,9 +142,7 @@ static void fm_list_view_select_all (FMDirectoryVi
static void fm_list_view_set_selection (FMDirectoryView *view, GList *selection);
static void fm_list_view_set_zoom_level (FMListView *list_view,
NautilusZoomLevel new_level,
gboolean notify_directory_view);
static void fm_list_view_init_zoom_params (FMListView *list_view,
NautilusZoomLevel zoom_level);
gboolean always_set_level);
static void fm_list_view_sort_items (FMListView *list_view,
int column,
gboolean reversed);
@ -855,7 +853,7 @@ fm_list_view_bump_zoom_level (FMDirectoryView *view, int zoom_increment)
NAUTILUS_ZOOM_LEVEL_LARGEST);
}
fm_list_view_set_zoom_level (list_view, new_level, TRUE);
fm_list_view_set_zoom_level (list_view, new_level, FALSE);
}
static void
@ -867,7 +865,7 @@ fm_list_view_zoom_to_level (FMDirectoryView *view, int zoom_level)
list_view = FM_LIST_VIEW (view);
fm_list_view_set_zoom_level (list_view, zoom_level, TRUE);
fm_list_view_set_zoom_level (list_view, zoom_level, FALSE);
}
static void
@ -880,7 +878,7 @@ fm_list_view_restore_default_zoom_level (FMDirectoryView *view)
list_view = FM_LIST_VIEW (view);
/* The list view is using NAUTILUS_ZOOM_LEVEL_SMALLER as default */
fm_list_view_set_zoom_level (list_view, NAUTILUS_ZOOM_LEVEL_SMALLER, TRUE);
fm_list_view_set_zoom_level (list_view, NAUTILUS_ZOOM_LEVEL_SMALLER, FALSE);
}
static gboolean
@ -942,12 +940,13 @@ fm_list_view_begin_loading (FMDirectoryView *view)
nautilus_connect_background_to_directory_metadata (GTK_WIDGET (get_list (list_view)),
directory);
fm_list_view_init_zoom_params (
fm_list_view_set_zoom_level (
list_view,
nautilus_directory_get_integer_metadata (
directory,
NAUTILUS_METADATA_KEY_LIST_VIEW_ZOOM_LEVEL,
list_view->details->default_zoom_level));
list_view->details->default_zoom_level),
TRUE);
fm_list_view_sort_items (
list_view,
@ -1075,7 +1074,7 @@ fm_list_view_get_zoom_level (FMListView *list_view)
static void
fm_list_view_set_zoom_level (FMListView *list_view,
NautilusZoomLevel new_level,
gboolean notify_directory_view)
gboolean always_set_level)
{
GtkCList *clist;
int row;
@ -1086,6 +1085,9 @@ fm_list_view_set_zoom_level (FMListView *list_view,
new_level <= NAUTILUS_ZOOM_LEVEL_LARGEST);
if (new_level == fm_list_view_get_zoom_level (list_view)) {
if (always_set_level) {
fm_directory_view_set_zoom_level (&list_view->parent, new_level);
}
return;
}
@ -1096,9 +1098,7 @@ fm_list_view_set_zoom_level (FMListView *list_view,
list_view->details->default_zoom_level,
new_level);
if (notify_directory_view) {
fm_directory_view_set_zoom_level (&list_view->parent, new_level);
}
fm_directory_view_set_zoom_level (&list_view->parent, new_level);
/* Reset default to new level; this way any change in zoom level
* will "stick" until the user visits a directory that had its zoom
@ -1137,17 +1137,6 @@ fm_list_view_set_zoom_level (FMListView *list_view,
gtk_clist_thaw (clist);
}
static void
fm_list_view_init_zoom_params (FMListView *view,
NautilusZoomLevel zoom_level)
{
fm_list_view_set_zoom_level (view, zoom_level, FALSE);
fm_directory_view_set_zoom_parameters (&view->parent,
zoom_level,
NAUTILUS_ZOOM_LEVEL_SMALLEST,
NAUTILUS_ZOOM_LEVEL_LARGEST);
}
static void
fm_list_view_reset_row_height (FMListView *list_view)
{

32
src/nautilus-navigation-window.c
View file

@ -98,7 +98,7 @@ static void zoom_out_callback (Nautilu
static void zoom_to_level_callback (NautilusZoomControl *zoom_control,
double level,
NautilusWindow *window);
static void zoom_default_callback (NautilusZoomControl *zoom_control,
static void zoom_to_fit_callback (NautilusZoomControl *zoom_control,
NautilusWindow *window);
static void sidebar_panels_changed_callback (gpointer user_data);
static NautilusViewFrame *window_find_sidebar_panel_by_identifier (NautilusWindow *window,
@ -264,11 +264,11 @@ zoom_out_callback (NautilusZoomControl *zoom_control,
}
static void
zoom_default_callback (NautilusZoomControl *zoom_control,
zoom_to_fit_callback (NautilusZoomControl *zoom_control,
NautilusWindow *window)
{
if (window->content_view != NULL) {
nautilus_view_frame_zoom_default (window->content_view);
nautilus_view_frame_zoom_to_fit (window->content_view);
}
}
@ -320,7 +320,7 @@ nautilus_window_constructed (NautilusWindow *window)
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_in", zoom_in_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_out", zoom_out_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_to_level", zoom_to_level_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_default", zoom_default_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_to_fit", zoom_to_fit_callback, window);
gtk_box_pack_end (GTK_BOX (location_bar_box), window->zoom_control, FALSE, FALSE, 0);
gtk_widget_show (location_bar_box);
@ -1137,24 +1137,11 @@ nautilus_window_zoom_level_changed_callback (NautilusViewFrame *view,
/* We rely on the initial zoom_level_change signal to inform us that the
* view-frame is showing a new zoomable.
*/
gtk_widget_show (window->zoom_control);
}
static void
nautilus_window_zoom_parameters_changed_callback (NautilusViewFrame *view,
double zoom_level,
double min_zoom_level,
double max_zoom_level,
NautilusWindow *window)
{
nautilus_zoom_control_set_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), zoom_level);
nautilus_zoom_control_set_min_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), min_zoom_level);
nautilus_zoom_control_set_max_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), max_zoom_level);
/* We rely on the initial zoom_level_change signal to inform us that the
* view-frame is showing a new zoomable.
*/
gtk_widget_show (window->zoom_control);
if (!GTK_WIDGET_VISIBLE(window->zoom_control)) {
nautilus_zoom_control_set_min_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), nautilus_view_frame_get_min_zoom_level (view));
nautilus_zoom_control_set_max_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), nautilus_view_frame_get_max_zoom_level (view));
gtk_widget_show (window->zoom_control);
}
}
void
@ -1177,7 +1164,6 @@ nautilus_window_connect_view (NautilusWindow *window, NautilusViewFrame *view)
CONNECT (report_load_failed);
CONNECT (set_title);
CONNECT (zoom_level_changed);
CONNECT (zoom_parameters_changed);
#undef CONNECT

32
src/nautilus-object-window.c
View file

@ -98,7 +98,7 @@ static void zoom_out_callback (Nautilu
static void zoom_to_level_callback (NautilusZoomControl *zoom_control,
double level,
NautilusWindow *window);
static void zoom_default_callback (NautilusZoomControl *zoom_control,
static void zoom_to_fit_callback (NautilusZoomControl *zoom_control,
NautilusWindow *window);
static void sidebar_panels_changed_callback (gpointer user_data);
static NautilusViewFrame *window_find_sidebar_panel_by_identifier (NautilusWindow *window,
@ -264,11 +264,11 @@ zoom_out_callback (NautilusZoomControl *zoom_control,
}
static void
zoom_default_callback (NautilusZoomControl *zoom_control,
zoom_to_fit_callback (NautilusZoomControl *zoom_control,
NautilusWindow *window)
{
if (window->content_view != NULL) {
nautilus_view_frame_zoom_default (window->content_view);
nautilus_view_frame_zoom_to_fit (window->content_view);
}
}
@ -320,7 +320,7 @@ nautilus_window_constructed (NautilusWindow *window)
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_in", zoom_in_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_out", zoom_out_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_to_level", zoom_to_level_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_default", zoom_default_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_to_fit", zoom_to_fit_callback, window);
gtk_box_pack_end (GTK_BOX (location_bar_box), window->zoom_control, FALSE, FALSE, 0);
gtk_widget_show (location_bar_box);
@ -1137,24 +1137,11 @@ nautilus_window_zoom_level_changed_callback (NautilusViewFrame *view,
/* We rely on the initial zoom_level_change signal to inform us that the
* view-frame is showing a new zoomable.
*/
gtk_widget_show (window->zoom_control);
}
static void
nautilus_window_zoom_parameters_changed_callback (NautilusViewFrame *view,
double zoom_level,
double min_zoom_level,
double max_zoom_level,
NautilusWindow *window)
{
nautilus_zoom_control_set_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), zoom_level);
nautilus_zoom_control_set_min_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), min_zoom_level);
nautilus_zoom_control_set_max_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), max_zoom_level);
/* We rely on the initial zoom_level_change signal to inform us that the
* view-frame is showing a new zoomable.
*/
gtk_widget_show (window->zoom_control);
if (!GTK_WIDGET_VISIBLE(window->zoom_control)) {
nautilus_zoom_control_set_min_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), nautilus_view_frame_get_min_zoom_level (view));
nautilus_zoom_control_set_max_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), nautilus_view_frame_get_max_zoom_level (view));
gtk_widget_show (window->zoom_control);
}
}
void
@ -1177,7 +1164,6 @@ nautilus_window_connect_view (NautilusWindow *window, NautilusViewFrame *view)
CONNECT (report_load_failed);
CONNECT (set_title);
CONNECT (zoom_level_changed);
CONNECT (zoom_parameters_changed);
#undef CONNECT

32
src/nautilus-spatial-window.c
View file

@ -98,7 +98,7 @@ static void zoom_out_callback (Nautilu
static void zoom_to_level_callback (NautilusZoomControl *zoom_control,
double level,
NautilusWindow *window);
static void zoom_default_callback (NautilusZoomControl *zoom_control,
static void zoom_to_fit_callback (NautilusZoomControl *zoom_control,
NautilusWindow *window);
static void sidebar_panels_changed_callback (gpointer user_data);
static NautilusViewFrame *window_find_sidebar_panel_by_identifier (NautilusWindow *window,
@ -264,11 +264,11 @@ zoom_out_callback (NautilusZoomControl *zoom_control,
}
static void
zoom_default_callback (NautilusZoomControl *zoom_control,
zoom_to_fit_callback (NautilusZoomControl *zoom_control,
NautilusWindow *window)
{
if (window->content_view != NULL) {
nautilus_view_frame_zoom_default (window->content_view);
nautilus_view_frame_zoom_to_fit (window->content_view);
}
}
@ -320,7 +320,7 @@ nautilus_window_constructed (NautilusWindow *window)
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_in", zoom_in_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_out", zoom_out_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_to_level", zoom_to_level_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_default", zoom_default_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_to_fit", zoom_to_fit_callback, window);
gtk_box_pack_end (GTK_BOX (location_bar_box), window->zoom_control, FALSE, FALSE, 0);
gtk_widget_show (location_bar_box);
@ -1137,24 +1137,11 @@ nautilus_window_zoom_level_changed_callback (NautilusViewFrame *view,
/* We rely on the initial zoom_level_change signal to inform us that the
* view-frame is showing a new zoomable.
*/
gtk_widget_show (window->zoom_control);
}
static void
nautilus_window_zoom_parameters_changed_callback (NautilusViewFrame *view,
double zoom_level,
double min_zoom_level,
double max_zoom_level,
NautilusWindow *window)
{
nautilus_zoom_control_set_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), zoom_level);
nautilus_zoom_control_set_min_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), min_zoom_level);
nautilus_zoom_control_set_max_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), max_zoom_level);
/* We rely on the initial zoom_level_change signal to inform us that the
* view-frame is showing a new zoomable.
*/
gtk_widget_show (window->zoom_control);
if (!GTK_WIDGET_VISIBLE(window->zoom_control)) {
nautilus_zoom_control_set_min_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), nautilus_view_frame_get_min_zoom_level (view));
nautilus_zoom_control_set_max_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), nautilus_view_frame_get_max_zoom_level (view));
gtk_widget_show (window->zoom_control);
}
}
void
@ -1177,7 +1164,6 @@ nautilus_window_connect_view (NautilusWindow *window, NautilusViewFrame *view)
CONNECT (report_load_failed);
CONNECT (set_title);
CONNECT (zoom_level_changed);
CONNECT (zoom_parameters_changed);
#undef CONNECT

60
src/nautilus-view-frame.c
View file

@ -51,7 +51,6 @@ enum {
REPORT_LOAD_FAILED,
SET_TITLE,
ZOOM_LEVEL_CHANGED,
ZOOM_PARAMETERS_CHANGED,
CLIENT_GONE,
LAST_SIGNAL
};
@ -162,15 +161,6 @@ nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass)
nautilus_gtk_marshal_NONE__DOUBLE,
GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE);
signals[ZOOM_PARAMETERS_CHANGED] =
gtk_signal_new ("zoom_parameters_changed",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass,
zoom_parameters_changed),
nautilus_gtk_marshal_NONE__DOUBLE_DOUBLE_DOUBLE,
GTK_TYPE_NONE, 3, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE, GTK_TYPE_DOUBLE);
signals[CLIENT_GONE] =
gtk_signal_new ("client_gone",
GTK_RUN_LAST,
@ -516,28 +506,6 @@ nautilus_view_frame_get_max_zoom_level (NautilusViewFrame *view)
return retval;
}
gboolean
nautilus_view_frame_get_is_continuous (NautilusViewFrame *view)
{
CORBA_Environment ev;
gboolean retval;
g_return_val_if_fail (NAUTILUS_IS_VIEW_FRAME (view), FALSE);
CORBA_exception_init (&ev);
if (!CORBA_Object_is_nil (view->zoomable, &ev)) {
retval = Nautilus_Zoomable__get_zoom_level (view->zoomable, &ev);
} else {
retval = FALSE;
}
CORBA_exception_free (&ev);
return retval;
}
void
nautilus_view_frame_zoom_in (NautilusViewFrame *view)
{
@ -575,24 +543,6 @@ nautilus_view_frame_zoom_out (NautilusViewFrame *view)
CORBA_exception_free (&ev);
}
void
nautilus_view_frame_zoom_default (NautilusViewFrame *view)
{
CORBA_Environment ev;
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init (&ev);
if (!CORBA_Object_is_nil (view->zoomable, &ev)) {
Nautilus_Zoomable_zoom_default (view->zoomable, &ev);
} else {
/* do nothing */
}
CORBA_exception_free (&ev);
}
void
nautilus_view_frame_zoom_to_fit (NautilusViewFrame *view)
{
@ -718,16 +668,6 @@ nautilus_view_frame_zoom_level_changed (NautilusViewFrame *view,
gtk_signal_emit (GTK_OBJECT (view), signals[ZOOM_LEVEL_CHANGED], level);
}
void
nautilus_view_frame_zoom_parameters_changed (NautilusViewFrame *view,
double level,
double min,
double max)
{
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
gtk_signal_emit (GTK_OBJECT (view), signals[ZOOM_PARAMETERS_CHANGED], level, min, max);
}
static gboolean
check_object(NautilusViewFrame *view)
{

5
src/nautilus-view-frame.h
View file

@ -101,10 +101,6 @@ typedef struct {
/* Part of Nautilus::ZoomableFrame CORBA interface. */
void (* zoom_level_changed) (NautilusViewFrame *view,
double zoom_level);
void (* zoom_parameters_changed) (NautilusViewFrame *view,
double zoom_level,
double min_zoom_level,
double max_zoom_level);
/* Error handling for when client goes away. */
void (* client_gone) (NautilusViewFrame *view);
@ -137,7 +133,6 @@ gdouble nautilus_view_frame_get_max_zoom_level (NautilusViewFrame *
gboolean nautilus_view_frame_get_is_continuous (NautilusViewFrame *view);
void nautilus_view_frame_zoom_in (NautilusViewFrame *view);
void nautilus_view_frame_zoom_out (NautilusViewFrame *view);
void nautilus_view_frame_zoom_default (NautilusViewFrame *view);
void nautilus_view_frame_zoom_to_fit (NautilusViewFrame *view);
/* Other. */

32
src/nautilus-window.c
View file

@ -98,7 +98,7 @@ static void zoom_out_callback (Nautilu
static void zoom_to_level_callback (NautilusZoomControl *zoom_control,
double level,
NautilusWindow *window);
static void zoom_default_callback (NautilusZoomControl *zoom_control,
static void zoom_to_fit_callback (NautilusZoomControl *zoom_control,
NautilusWindow *window);
static void sidebar_panels_changed_callback (gpointer user_data);
static NautilusViewFrame *window_find_sidebar_panel_by_identifier (NautilusWindow *window,
@ -264,11 +264,11 @@ zoom_out_callback (NautilusZoomControl *zoom_control,
}
static void
zoom_default_callback (NautilusZoomControl *zoom_control,
zoom_to_fit_callback (NautilusZoomControl *zoom_control,
NautilusWindow *window)
{
if (window->content_view != NULL) {
nautilus_view_frame_zoom_default (window->content_view);
nautilus_view_frame_zoom_to_fit (window->content_view);
}
}
@ -320,7 +320,7 @@ nautilus_window_constructed (NautilusWindow *window)
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_in", zoom_in_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_out", zoom_out_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_to_level", zoom_to_level_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_default", zoom_default_callback, window);
gtk_signal_connect (GTK_OBJECT (window->zoom_control), "zoom_to_fit", zoom_to_fit_callback, window);
gtk_box_pack_end (GTK_BOX (location_bar_box), window->zoom_control, FALSE, FALSE, 0);
gtk_widget_show (location_bar_box);
@ -1137,24 +1137,11 @@ nautilus_window_zoom_level_changed_callback (NautilusViewFrame *view,
/* We rely on the initial zoom_level_change signal to inform us that the
* view-frame is showing a new zoomable.
*/
gtk_widget_show (window->zoom_control);
}
static void
nautilus_window_zoom_parameters_changed_callback (NautilusViewFrame *view,
double zoom_level,
double min_zoom_level,
double max_zoom_level,
NautilusWindow *window)
{
nautilus_zoom_control_set_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), zoom_level);
nautilus_zoom_control_set_min_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), min_zoom_level);
nautilus_zoom_control_set_max_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), max_zoom_level);
/* We rely on the initial zoom_level_change signal to inform us that the
* view-frame is showing a new zoomable.
*/
gtk_widget_show (window->zoom_control);
if (!GTK_WIDGET_VISIBLE(window->zoom_control)) {
nautilus_zoom_control_set_min_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), nautilus_view_frame_get_min_zoom_level (view));
nautilus_zoom_control_set_max_zoom_level (NAUTILUS_ZOOM_CONTROL (window->zoom_control), nautilus_view_frame_get_max_zoom_level (view));
gtk_widget_show (window->zoom_control);
}
}
void
@ -1177,7 +1164,6 @@ nautilus_window_connect_view (NautilusWindow *window, NautilusViewFrame *view)
CONNECT (report_load_failed);
CONNECT (set_title);
CONNECT (zoom_level_changed);
CONNECT (zoom_parameters_changed);
#undef CONNECT

35
src/nautilus-zoom-control.c
View file

@ -45,7 +45,7 @@ enum {
ZOOM_IN,
ZOOM_OUT,
ZOOM_TO_LEVEL,
ZOOM_DEFAULT,
ZOOM_TO_FIT,
LAST_SIGNAL
};
@ -134,12 +134,12 @@ nautilus_zoom_control_class_initialize (NautilusZoomControlClass *class)
1,
GTK_TYPE_DOUBLE);
signals[ZOOM_DEFAULT] =
gtk_signal_new ("zoom_default",
signals[ZOOM_TO_FIT] =
gtk_signal_new ("zoom_to_fit",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusZoomControlClass,
zoom_default),
zoom_to_fit),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
@ -154,9 +154,9 @@ nautilus_zoom_control_initialize (NautilusZoomControl *zoom_control)
char *file_name;
GtkWidget *pix_widget;
zoom_control->zoom_level = 1.0;
zoom_control->zoom_level = 1.0;
zoom_control->min_zoom_level = 0.0;
zoom_control->max_zoom_level = 4.0;
zoom_control->max_zoom_level = 2.0;
/* allocate the pixmap that holds the image */
@ -322,7 +322,7 @@ nautilus_zoom_control_button_press_event (GtkWidget *widget, GdkEventButton *eve
} else if ((event->x > ((2 * width) / 3)) && (zoom_control->zoom_level < zoom_control->max_zoom_level)) {
gtk_signal_emit (GTK_OBJECT (widget), signals[ZOOM_IN]);
} else if ((event->x >= (center - (width >> 3))) && (event->x <= (center + (width >> 3)))) {
gtk_signal_emit (GTK_OBJECT (widget), signals[ZOOM_DEFAULT]);
gtk_signal_emit (GTK_OBJECT (widget), signals[ZOOM_TO_FIT]);
}
/*
@ -336,27 +336,6 @@ nautilus_zoom_control_button_press_event (GtkWidget *widget, GdkEventButton *eve
return TRUE;
}
/*
* FIXME bugzila.eazel.com 1425:
*
* The term zoom level is overloaded in our sources:
*
* The zoom control function APIs (e.g. nautilus_zoom_control_set_zoom_level)
* uses doubles for zoom level (e.g. 1.5 = 150% zoom). This matches nicely with
* nautilus-zoomable interface which uses doubles for zoom level too.
*
* However, internally the zoom control keeps state (current_zoom) in terms of
* NautilusZoomLevel's which are defined in nautilus-icon-factory.h as the 7
* discrete icon sizes.
*
* Furthermore, the signals the zoom control emits, specifically zoom_to_level,
* passes a zoom level that's one of the NautilusZoomLevel's.
*
* It would probably be cleaner to redo the zoom control APIs to all work on
* doubles.
*/
void
nautilus_zoom_control_set_zoom_level (NautilusZoomControl *zoom_control, double zoom_level)
{

2
src/nautilus-zoom-control.h
View file

@ -56,7 +56,7 @@ struct NautilusZoomControlClass {
void (*zoom_in) (NautilusZoomControl *control);
void (*zoom_out) (NautilusZoomControl *control);
void (*zoom_to_level) (NautilusZoomControl *control);
void (*zoom_default) (NautilusZoomControl *control);
void (*zoom_to_fit) (NautilusZoomControl *control);
};
GtkType nautilus_zoom_control_get_type (void);

18
src/nautilus-zoomable-frame-corba.c
View file

@ -43,17 +43,10 @@ static void impl_Nautilus_ZoomableFrame_report_zoom_level_changed (PortableServe
CORBA_double level,
CORBA_Environment *ev);
static void impl_Nautilus_ZoomableFrame_report_zoom_parameters_changed (PortableServer_Servant servant,
CORBA_double level,
CORBA_double min,
CORBA_double max,
CORBA_Environment *ev);
POA_Nautilus_ZoomableFrame__epv impl_Nautilus_ZoomableFrame_epv =
{
NULL,
impl_Nautilus_ZoomableFrame_report_zoom_level_changed,
impl_Nautilus_ZoomableFrame_report_zoom_parameters_changed,
};
static PortableServer_ServantBase__epv base_epv;
@ -122,14 +115,3 @@ impl_Nautilus_ZoomableFrame_report_zoom_level_changed (PortableServer_Servant se
(((impl_POA_Nautilus_ZoomableFrame *) servant)->view,
level);
}
static void
impl_Nautilus_ZoomableFrame_report_zoom_parameters_changed (PortableServer_Servant servant,
CORBA_double level,
CORBA_double min,
CORBA_double max,
CORBA_Environment *ev)
{
nautilus_view_frame_zoom_parameters_changed
(((impl_POA_Nautilus_ZoomableFrame *) servant)->view, level, min, max);
}