Commit f168881c authored by David Odin's avatar David Odin

app/display/gimpnavigationview.c renamed these files to...

* app/display/gimpnavigationview.c
* app/display/gimpnavigationview.h: renamed these files to...

* app/display/gimpnavigationeditor.c
* app/display/gimpnavigationeditor.h: ... these files, and of course
  changed GimpNavigationView to GimpNavigationEditor since it is really
  inherited from GimpEditor anyway.

This will leave the gimp_navigation_view namespace for the renaming
from gimp_navigation_preview.

* app/display/Makefile.am
* app/display/display-types.h
* app/display/gimpdisplayshell-callbacks.c
* app/gui/dialogs-constructors.c: Changed accordlingly.
parent da34232a
2004-08-25 DindinX <david@dindinx.org>
* app/display/gimpnavigationview.c
* app/display/gimpnavigationview.h: renamed these files to...
* app/display/gimpnavigationeditor.c
* app/display/gimpnavigationeditor.h: ... these files, and of course
changed GimpNavigationView to GimpNavigationEditor since it is really
inherited from GimpEditor anyway.
This will leave the gimp_navigation_view namespace for the renaming
from gimp_navigation_preview.
* app/display/Makefile.am
* app/display/display-types.h
* app/display/gimpdisplayshell-callbacks.c
* app/gui/dialogs-constructors.c: Changed accordlingly.
2004-08-25 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-title.c
......
......@@ -68,7 +68,7 @@
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "display/gimpnavigationview.h"
#include "display/gimpnavigationeditor.h"
#include "actions/channels-commands.h"
#include "actions/edit-commands.h"
......@@ -829,8 +829,8 @@ dialogs_navigation_view_new (GimpDialogFactory *factory,
if (gdisp)
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
view = gimp_navigation_view_new (shell,
GIMP_DISPLAY_CONFIG (context->gimp->config));
view = gimp_navigation_editor_new (shell,
GIMP_DISPLAY_CONFIG (context->gimp->config));
return dialogs_dockable_new (view,
_("Navigation"), _("Display Navigation"),
......
......@@ -62,8 +62,8 @@ libappdisplay_a_sources = \
gimpdisplayshell-title.h \
gimpdisplayshell-transform.c \
gimpdisplayshell-transform.h \
gimpnavigationview.c \
gimpnavigationview.h \
gimpnavigationeditor.c \
gimpnavigationeditor.h \
gimpscalecombobox.c \
gimpscalecombobox.h \
gimpstatusbar.c \
......
......@@ -31,7 +31,7 @@ typedef struct _GimpDisplay GimpDisplay;
typedef struct _GimpDisplayShell GimpDisplayShell;
/* typedef struct _GimpDisplayOptions GimpDisplayOptions; in config-types.h */
typedef struct _GimpNavigationView GimpNavigationView;
typedef struct _GimpNavigationEditor GimpNavigationEditor;
typedef struct _GimpScaleComboBox GimpScaleComboBox;
typedef struct _GimpStatusbar GimpStatusbar;
......
......@@ -71,7 +71,7 @@
#include "gimpdisplayshell-selection.h"
#include "gimpdisplayshell-title.h"
#include "gimpdisplayshell-transform.h"
#include "gimpnavigationview.h"
#include "gimpnavigationeditor.h"
#include "gimp-intl.h"
......@@ -1555,7 +1555,7 @@ gimp_display_shell_nav_button_press (GtkWidget *widget,
{
if ((bevent->type == GDK_BUTTON_PRESS) && (bevent->button == 1))
{
gimp_navigation_view_popup (shell, widget, bevent->x, bevent->y);
gimp_navigation_editor_popup (shell, widget, bevent->x, bevent->y);
}
return TRUE;
......
This diff is collapsed.
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpnavigationview.h
* gimpnavigationeditor.h
* Copyright (C) 2002 Michael Natterer <mitch@gimp.org>
*
* partly based on app/nav_window
......@@ -22,24 +22,24 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_NAVIGATION_VIEW_H__
#define __GIMP_NAVIGATION_VIEW_H__
#ifndef __GIMP_NAVIGATION_EDITOR_H__
#define __GIMP_NAVIGATION_EDITOR_H__
#include "widgets/gimpeditor.h"
#define GIMP_TYPE_NAVIGATION_VIEW (gimp_navigation_view_get_type ())
#define GIMP_NAVIGATION_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_NAVIGATION_VIEW, GimpNavigationView))
#define GIMP_NAVIGATION_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_NAVIGATION_VIEW, GimpNavigationViewClass))
#define GIMP_IS_NAVIGATION_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_NAVIGATION_VIEW))
#define GIMP_IS_NAVIGATION_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_NAVIGATION_VIEW))
#define GIMP_NAVIGATION_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_NAVIGATION_VIEW, GimpNavigationViewClass))
#define GIMP_TYPE_NAVIGATION_EDITOR (gimp_navigation_editor_get_type ())
#define GIMP_NAVIGATION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_NAVIGATION_EDITOR, GimpNavigationEditor))
#define GIMP_NAVIGATION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_NAVIGATION_EDITOR, GimpNavigationEditorClass))
#define GIMP_IS_NAVIGATION_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_NAVIGATION_EDITOR))
#define GIMP_IS_NAVIGATION_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_NAVIGATION_EDITOR))
#define GIMP_NAVIGATION_EDITOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_NAVIGATION_EDITOR, GimpNavigationEditorClass))
typedef struct _GimpNavigationViewClass GimpNavigationViewClass;
typedef struct _GimpNavigationEditorClass GimpNavigationEditorClass;
struct _GimpNavigationView
struct _GimpNavigationEditor
{
GimpEditor parent_instance;
......@@ -58,23 +58,23 @@ struct _GimpNavigationView
GtkWidget *shrink_wrap_button;
};
struct _GimpNavigationViewClass
struct _GimpNavigationEditorClass
{
GimpEditorClass parent_class;
};
GType gimp_navigation_view_get_type (void) G_GNUC_CONST;
GType gimp_navigation_editor_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_navigation_view_new (GimpDisplayShell *shell,
GimpDisplayConfig *config);
void gimp_navigation_view_set_shell (GimpNavigationView *view,
GimpDisplayShell *shell);
GtkWidget * gimp_navigation_editor_new (GimpDisplayShell *shell,
GimpDisplayConfig *config);
void gimp_navigation_editor_set_shell (GimpNavigationEditor *view,
GimpDisplayShell *shell);
void gimp_navigation_view_popup (GimpDisplayShell *shell,
GtkWidget *widget,
gint click_x,
gint click_y);
void gimp_navigation_editor_popup (GimpDisplayShell *shell,
GtkWidget *widget,
gint click_x,
gint click_y);
#endif /* __GIMP_NAVIGATION_VIEW_H__ */
#endif /* __GIMP_NAVIGATION_EDITOR_H__ */
This diff is collapsed.
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* gimpnavigationview.h
* Copyright (C) 2002 Michael Natterer <mitch@gimp.org>
*
* partly based on app/nav_window
* Copyright (C) 1999 Andy Thomas <alt@gimp.org>
*
* This program 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.
*
* This program 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __GIMP_NAVIGATION_VIEW_H__
#define __GIMP_NAVIGATION_VIEW_H__
#include "widgets/gimpeditor.h"
#define GIMP_TYPE_NAVIGATION_VIEW (gimp_navigation_view_get_type ())
#define GIMP_NAVIGATION_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_NAVIGATION_VIEW, GimpNavigationView))
#define GIMP_NAVIGATION_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_NAVIGATION_VIEW, GimpNavigationViewClass))
#define GIMP_IS_NAVIGATION_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_NAVIGATION_VIEW))
#define GIMP_IS_NAVIGATION_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_NAVIGATION_VIEW))
#define GIMP_NAVIGATION_VIEW_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_NAVIGATION_VIEW, GimpNavigationViewClass))
typedef struct _GimpNavigationViewClass GimpNavigationViewClass;
struct _GimpNavigationView
{
GimpEditor parent_instance;
GimpContext *context;
GimpDisplayShell *shell;
GtkWidget *preview;
GtkWidget *zoom_label;
GtkAdjustment *zoom_adjustment;
GtkWidget *zoom_out_button;
GtkWidget *zoom_in_button;
GtkWidget *zoom_100_button;
GtkWidget *zoom_fit_in_button;
GtkWidget *zoom_fit_to_button;
GtkWidget *shrink_wrap_button;
};
struct _GimpNavigationViewClass
{
GimpEditorClass parent_class;
};
GType gimp_navigation_view_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_navigation_view_new (GimpDisplayShell *shell,
GimpDisplayConfig *config);
void gimp_navigation_view_set_shell (GimpNavigationView *view,
GimpDisplayShell *shell);
void gimp_navigation_view_popup (GimpDisplayShell *shell,
GtkWidget *widget,
gint click_x,
gint click_y);
#endif /* __GIMP_NAVIGATION_VIEW_H__ */
......@@ -68,7 +68,7 @@
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "display/gimpnavigationview.h"
#include "display/gimpnavigationeditor.h"
#include "actions/channels-commands.h"
#include "actions/edit-commands.h"
......@@ -829,8 +829,8 @@ dialogs_navigation_view_new (GimpDialogFactory *factory,
if (gdisp)
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
view = gimp_navigation_view_new (shell,
GIMP_DISPLAY_CONFIG (context->gimp->config));
view = gimp_navigation_editor_new (shell,
GIMP_DISPLAY_CONFIG (context->gimp->config));
return dialogs_dockable_new (view,
_("Navigation"), _("Display Navigation"),
......
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