Skip to content

GitLab

Files
Files
Commit 38dea32b authored by Cosimo Cecchi's avatar Cosimo Cecchi
Browse files
Options

all: remove NautilusZoomAction 

Now that we don't use it on the toolbar anymore, it's useless to keep
around.
parent d8317302
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 319 deletions
src/Makefile.am
View file @ 38dea32b
......@@ -162,8 +162,6 @@ nautilus_SOURCES = \
nautilus-window-types.h \
nautilus-x-content-bar.c \
nautilus-x-content-bar.h \
nautilus-zoom-action.c \
nautilus-zoom-action.h \
nautilus-zoom-control.c \
nautilus-zoom-control.h \
$(NULL)
......
src/nautilus-navigation-window-menus.c
View file @ 38dea32b
......@@ -30,7 +30,6 @@
#include "nautilus-actions.h"
#include "nautilus-notebook.h"
#include "nautilus-navigation-action.h"
#include "nautilus-zoom-action.h"
#include "nautilus-view-as-action.h"
#include "nautilus-application.h"
#include "nautilus-bookmark-list.h"
......@@ -807,16 +806,6 @@ nautilus_navigation_window_initialize_actions (NautilusNavigationWindow *window)
g_object_unref (action);
action = g_object_new (NAUTILUS_TYPE_ZOOM_ACTION,
"name", "Zoom",
"label", _("_Zoom"),
"window", window,
"is_important", FALSE,
NULL);
gtk_action_group_add_action (action_group,
action);
g_object_unref (action);
action = g_object_new (NAUTILUS_TYPE_VIEW_AS_ACTION,
"name", "ViewAs",
"label", _("_View As"),
......
src/nautilus-window-manage-views.c
View file @ 38dea32b
......@@ -39,7 +39,6 @@
#include "nautilus-trash-bar.h"
#include "nautilus-view-factory.h"
#include "nautilus-x-content-bar.h"
#include "nautilus-zoom-control.h"
#include "nautilus-navigation-window-pane.h"
#include <eel/eel-accessibility.h>
#include <eel/eel-debug.h>
......
src/nautilus-window-menus.c
View file @ 38dea32b
......@@ -212,25 +212,38 @@ action_reload_callback (GtkAction *action,
nautilus_window_slot_reload (slot);
}
static NautilusView *
get_current_view (NautilusWindow *window)
{
NautilusWindowSlot *slot;
NautilusView *view;
slot = nautilus_window_get_active_slot (window);
view = nautilus_window_slot_get_current_view (slot);
return view;
}
static void
action_zoom_in_callback (GtkAction *action,
gpointer user_data)
{
nautilus_window_zoom_in (NAUTILUS_WINDOW (user_data));
nautilus_view_bump_zoom_level (get_current_view (user_data), 1);
}
static void
action_zoom_out_callback (GtkAction *action,
gpointer user_data)
{
nautilus_window_zoom_out (NAUTILUS_WINDOW (user_data));
nautilus_view_bump_zoom_level (get_current_view (user_data), -1);
}
static void
action_zoom_normal_callback (GtkAction *action,
gpointer user_data)
{
nautilus_window_zoom_to_default (NAUTILUS_WINDOW (user_data));
nautilus_view_restore_default_zoom_level (get_current_view (user_data));
}
static void
......
src/nautilus-window-private.h
View file @ 38dea32b
......@@ -179,11 +179,6 @@ void nautilus_menus_append_bookmark_to_menu (Nautil
GCallback refresh_callback,
NautilusBookmarkFailedCallback failed_callback);
void nautilus_window_update_find_menu_item (NautilusWindow *window);
void nautilus_window_zoom_in (NautilusWindow *window);
void nautilus_window_zoom_out (NautilusWindow *window);
void nautilus_window_zoom_to_level (NautilusWindow *window,
NautilusZoomLevel level);
void nautilus_window_zoom_to_default (NautilusWindow *window);
NautilusWindowSlot *nautilus_window_open_slot (NautilusWindowPane *pane,
NautilusWindowOpenSlotFlags flags);
......
src/nautilus-window.c
View file @ 38dea32b
......@@ -352,43 +352,6 @@ nautilus_window_prompt_for_location (NautilusWindow *window,
prompt_for_location, (window, initial));
}
static NautilusView *
nautilus_window_get_active_view (NautilusWindow *window)
{
NautilusWindowSlot *slot;
NautilusView *view;
slot = window->details->active_pane->active_slot;
view = slot->content_view;
return view;
}
void
nautilus_window_zoom_in (NautilusWindow *window)
{
nautilus_view_bump_zoom_level (nautilus_window_get_active_view (window), 1);
}
void
nautilus_window_zoom_to_level (NautilusWindow *window,
NautilusZoomLevel level)
{
nautilus_view_zoom_to_level (nautilus_window_get_active_view (window), level);
}
void
nautilus_window_zoom_out (NautilusWindow *window)
{
nautilus_view_bump_zoom_level (nautilus_window_get_active_view (window), -1);
}
void
nautilus_window_zoom_to_default (NautilusWindow *window)
{
nautilus_view_restore_default_zoom_level (nautilus_window_get_active_view (window));
}
/* Code should never force the window taller than this size.
* (The user can still stretch the window taller if desired).
*/
......
src/nautilus-zoom-action.c deleted 100644 → 0
View file @ d8317302
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
/*
* Nautilus
*
* Copyright (C) 2009 Red Hat, Inc.
*
* Nautilus is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* Nautilus is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Authors: Alexander Larsson <alexl@redhat.com>
*
*/
#include <config.h>
#include "nautilus-zoom-action.h"
#include "nautilus-zoom-control.h"
#include "nautilus-navigation-window.h"
#include "nautilus-window-private.h"
#include "nautilus-navigation-window-slot.h"
#include <gtk/gtk.h>
#include <eel/eel-gtk-extensions.h>
G_DEFINE_TYPE (NautilusZoomAction, nautilus_zoom_action, GTK_TYPE_ACTION)
static void nautilus_zoom_action_init (NautilusZoomAction *action);
static void nautilus_zoom_action_class_init (NautilusZoomActionClass *class);
static GObjectClass *parent_class = NULL;
#define NAUTILUS_ZOOM_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), NAUTILUS_TYPE_ZOOM_ACTION, NautilusZoomActionPrivate))
struct NautilusZoomActionPrivate
{
NautilusNavigationWindow *window;
};
enum
{
PROP_0,
PROP_WINDOW
};
static void
zoom_changed_callback (NautilusWindow *window,
NautilusZoomLevel zoom_level,
gboolean supports_zooming,
gboolean can_zoom,
gboolean can_zoom_in,
gboolean can_zoom_out,
GtkWidget *zoom_control)
{
if (supports_zooming) {
gtk_widget_set_sensitive (zoom_control, can_zoom);
gtk_widget_show (zoom_control);
if (can_zoom) {
nautilus_zoom_control_set_zoom_level (NAUTILUS_ZOOM_CONTROL (zoom_control),
zoom_level);
}
} else {
gtk_widget_hide (zoom_control);
}
}
static void
connect_proxy (GtkAction *action,
GtkWidget *proxy)
{
if (GTK_IS_TOOL_ITEM (proxy)) {
GtkToolItem *item = GTK_TOOL_ITEM (proxy);
NautilusZoomAction *zaction = NAUTILUS_ZOOM_ACTION (action);
NautilusNavigationWindow *window = zaction->priv->window;
GtkWidget *zoom_control;
zoom_control = nautilus_zoom_control_new ();
gtk_container_set_border_width (GTK_CONTAINER (item), 4);
gtk_container_add (GTK_CONTAINER (item), zoom_control);
gtk_widget_show (zoom_control);
g_signal_connect_object (zoom_control, "zoom_in",
G_CALLBACK (nautilus_window_zoom_in),
window, G_CONNECT_SWAPPED);
g_signal_connect_object (zoom_control, "zoom_out",
G_CALLBACK (nautilus_window_zoom_out),
window, G_CONNECT_SWAPPED);
g_signal_connect_object (zoom_control, "zoom_to_level",
G_CALLBACK (nautilus_window_zoom_to_level),
window, G_CONNECT_SWAPPED);
g_signal_connect_object (zoom_control, "zoom_to_default",
G_CALLBACK (nautilus_window_zoom_to_default),
window, G_CONNECT_SWAPPED);
g_signal_connect (window, "zoom-changed",
G_CALLBACK (zoom_changed_callback),
zoom_control);
}
(* GTK_ACTION_CLASS (parent_class)->connect_proxy) (action, proxy);
}
static void
disconnect_proxy (GtkAction *action,
GtkWidget *proxy)
{
if (GTK_IS_TOOL_ITEM (proxy)) {
GtkToolItem *item = GTK_TOOL_ITEM (proxy);
NautilusZoomAction *zaction = NAUTILUS_ZOOM_ACTION (action);
NautilusNavigationWindow *window = zaction->priv->window;
GtkWidget *child;
child = gtk_bin_get_child (GTK_BIN (item));
g_signal_handlers_disconnect_by_func (window, G_CALLBACK (zoom_changed_callback), child);
}
(* GTK_ACTION_CLASS (parent_class)->disconnect_proxy) (action, proxy);
}
static void
nautilus_zoom_action_finalize (GObject *object)
{
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
nautilus_zoom_action_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
NautilusZoomAction *zoom;
zoom = NAUTILUS_ZOOM_ACTION (object);
switch (prop_id) {
case PROP_WINDOW:
zoom->priv->window = NAUTILUS_NAVIGATION_WINDOW (g_value_get_object (value));
break;
}
}
static void
nautilus_zoom_action_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
NautilusZoomAction *zoom;
zoom = NAUTILUS_ZOOM_ACTION (object);
switch (prop_id) {
case PROP_WINDOW:
g_value_set_object (value, zoom->priv->window);
break;
}
}
static void
nautilus_zoom_action_class_init (NautilusZoomActionClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkActionClass *action_class = GTK_ACTION_CLASS (class);
object_class->finalize = nautilus_zoom_action_finalize;
object_class->set_property = nautilus_zoom_action_set_property;
object_class->get_property = nautilus_zoom_action_get_property;
parent_class = g_type_class_peek_parent (class);
action_class->toolbar_item_type = GTK_TYPE_TOOL_ITEM;
action_class->connect_proxy = connect_proxy;
action_class->disconnect_proxy = disconnect_proxy;
g_object_class_install_property (object_class,
PROP_WINDOW,
g_param_spec_object ("window",
"Window",
"The navigation window",
G_TYPE_OBJECT,
G_PARAM_READWRITE));
g_type_class_add_private (object_class, sizeof(NautilusZoomActionPrivate));
}
static void
nautilus_zoom_action_init (NautilusZoomAction *action)
{
action->priv = NAUTILUS_ZOOM_ACTION_GET_PRIVATE (action);
}
src/nautilus-zoom-action.h deleted 100644 → 0
View file @ d8317302
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
/*
* Nautilus
*
* Copyright (C) 2009 Red Hat, Inc.
*
* Nautilus is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* Nautilus is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Authors: Alexander Larsson <alexl@redhat.com>
*
*/
#ifndef NAUTILUS_ZOOM_ACTION_H
#define NAUTILUS_ZOOM_ACTION_H
#include <gtk/gtk.h>
#define NAUTILUS_TYPE_ZOOM_ACTION (nautilus_zoom_action_get_type ())
#define NAUTILUS_ZOOM_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_ZOOM_ACTION, NautilusZoomAction))
#define NAUTILUS_ZOOM_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_ZOOM_ACTION, NautilusZoomActionClass))
#define NAUTILUS_IS_ZOOM_ACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NAUTILUS_TYPE_ZOOM_ACTION))
#define NAUTILUS_IS_ZOOM_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_ZOOM_ACTION))
#define NAUTILUS_ZOOM_ACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), NAUTILUS_TYPE_ZOOM_ACTION, NautilusZoomActionClass))
typedef struct _NautilusZoomAction NautilusZoomAction;
typedef struct _NautilusZoomActionClass NautilusZoomActionClass;
typedef struct NautilusZoomActionPrivate NautilusZoomActionPrivate;
struct _NautilusZoomAction
{
GtkAction parent;
/*< private >*/
NautilusZoomActionPrivate *priv;
};
struct _NautilusZoomActionClass
{
GtkActionClass parent_class;
};
GType nautilus_zoom_action_get_type (void);
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment