Commit f766956e authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

added gimp_button_extended_clicked() which emits the resp. signal.

2001-10-24  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimpbutton.[ch]: added
	gimp_button_extended_clicked() which emits the resp. signal.

	* app/gui/menus.[ch]: added new item factories "<Buffers>" and
	"<Documents>".

	* app/gui/Makefile.am
	* app/gui/buffers-commands.[ch]
	* app/gui/documents-commands.[ch]: new files for the callbacks.

	* app/gui/dialogs-constructors.c: use them.

	* app/gui/file-open-dialog.c: set the title to "Open Image",
	not "Load Image".
parent 1261ba7b
2001-10-24 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpbutton.[ch]: added
gimp_button_extended_clicked() which emits the resp. signal.
* app/gui/menus.[ch]: added new item factories "<Buffers>" and
"<Documents>".
* app/gui/Makefile.am
* app/gui/buffers-commands.[ch]
* app/gui/documents-commands.[ch]: new files for the callbacks.
* app/gui/dialogs-constructors.c: use them.
* app/gui/file-open-dialog.c: set the title to "Open Image",
not "Load Image".
2001-10-23 Michael Natterer <mitch@gimp.org>
* app/app_procs.c: pass a "Gimp" to gui_libs_init(), initialize
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* 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.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "core/gimpbuffer.h"
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
#include "widgets/gimpbufferview.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimplistitem.h"
#include "widgets/gimppreview.h"
#include "widgets/gimpwidgets-utils.h"
#include "buffers-commands.h"
#include "menus.h"
#include "libgimp/gimpintl.h"
/* local function prototypes */
static void buffers_menu_set_sensitivity (GimpContainerEditor *editor);
/* public functionss */
void
buffers_paste_buffer_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpBufferView *view;
view = (GimpBufferView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->paste_button));
}
void
buffers_paste_buffer_into_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpBufferView *view;
view = (GimpBufferView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->paste_into_button));
}
void
buffers_paste_buffer_as_new_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpBufferView *view;
view = (GimpBufferView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->paste_as_new_button));
}
void
buffers_delete_buffer_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpBufferView *view;
view = (GimpBufferView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->delete_button));
}
void
buffers_show_context_menu (GimpContainerEditor *editor)
{
GtkItemFactory *item_factory;
buffers_menu_set_sensitivity (editor);
item_factory = menus_get_buffers_factory ();
gimp_item_factory_popup_with_data (item_factory, editor);
}
/* private functions */
static void
buffers_menu_set_sensitivity (GimpContainerEditor *editor)
{
GimpBuffer *buffer;
buffer = gimp_context_get_buffer (editor->view->context);
#define SET_SENSITIVE(menu,condition) \
menus_set_sensitive ("<Buffers>/" menu, (condition) != 0)
SET_SENSITIVE ("Paste Buffer", buffer);
SET_SENSITIVE ("Paste Buffer Into", buffer);
SET_SENSITIVE ("Paste Buffer as New", buffer);
SET_SENSITIVE ("Delete Buffer", buffer);
#undef SET_SENSITIVE
}
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* 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 __BUFFERS_COMMANDS_H__
#define __BUFFERS_COMMANDS_H__
void buffers_paste_buffer_cmd_callback (GtkWidget *widget,
gpointer data);
void buffers_paste_buffer_into_cmd_callback (GtkWidget *widget,
gpointer data);
void buffers_paste_buffer_as_new_cmd_callback (GtkWidget *widget,
gpointer data);
void buffers_delete_buffer_cmd_callback (GtkWidget *widget,
gpointer data);
void buffers_show_context_menu (GimpContainerEditor *editor);
#endif /* __BUFFERS_COMMANDS_H__ */
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* 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.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
#include "core/gimpimagefile.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpdocumentview.h"
#include "widgets/gimpwidgets-utils.h"
#include "documents-commands.h"
#include "menus.h"
#include "libgimp/gimpintl.h"
/* local function prototypes */
static void documents_menu_set_sensitivity (GimpContainerEditor *editor);
/* public functionss */
void
documents_open_document_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpDocumentView *view;
view = (GimpDocumentView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->open_button));
}
void
documents_raise_or_open_document_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpDocumentView *view;
view = (GimpDocumentView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gimp_button_extended_clicked (GIMP_BUTTON (view->open_button),
GDK_SHIFT_MASK);
}
void
documents_file_open_dialog_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpDocumentView *view;
view = (GimpDocumentView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gimp_button_extended_clicked (GIMP_BUTTON (view->open_button),
GDK_CONTROL_MASK);
}
void
documents_delete_document_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpDocumentView *view;
view = (GimpDocumentView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->delete_button));
}
void
documents_refresh_documents_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpDocumentView *view;
view = (GimpDocumentView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->refresh_button));
}
void
documents_show_context_menu (GimpContainerEditor *editor)
{
GtkItemFactory *item_factory;
documents_menu_set_sensitivity (editor);
item_factory = menus_get_documents_factory ();
gimp_item_factory_popup_with_data (item_factory, editor);
}
/* private functions */
static void
documents_menu_set_sensitivity (GimpContainerEditor *editor)
{
GimpImagefile *imagefile;
imagefile = gimp_context_get_imagefile (editor->view->context);
#define SET_SENSITIVE(menu,condition) \
menus_set_sensitive ("<Documents>/" menu, (condition) != 0)
SET_SENSITIVE ("Open Image", imagefile);
SET_SENSITIVE ("Raise or Open Image", imagefile);
SET_SENSITIVE ("File Open Dialog...", TRUE);
SET_SENSITIVE ("Remove Entry", imagefile);
SET_SENSITIVE ("Refresh History", TRUE);
#undef SET_SENSITIVE
}
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* 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 __DOCUMENTS_COMMANDS_H__
#define __DOCUMENTS_COMMANDS_H__
void documents_open_document_cmd_callback (GtkWidget *widget,
gpointer data);
void documents_raise_or_open_document_cmd_callback (GtkWidget *widget,
gpointer data);
void documents_file_open_dialog_cmd_callback (GtkWidget *widget,
gpointer data);
void documents_delete_document_cmd_callback (GtkWidget *widget,
gpointer data);
void documents_refresh_documents_cmd_callback (GtkWidget *widget,
gpointer data);
void documents_show_context_menu (GimpContainerEditor *editor);
#endif /* __DOCUMENTS_COMMANDS_H__ */
......@@ -24,7 +24,6 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "tools/tools-types.h"
#include "core/gimp.h"
#include "core/gimpbrushgenerated.h"
......@@ -54,11 +53,13 @@
#include "brush-editor.h"
#include "brush-select.h"
#include "brushes-commands.h"
#include "buffers-commands.h"
#include "channels-commands.h"
#include "color-area.h"
#include "colormap-dialog.h"
#include "dialogs.h"
#include "dialogs-constructors.h"
#include "documents-commands.h"
#include "error-console-dialog.h"
#include "gradient-editor.h"
#include "gradient-select.h"
......@@ -462,7 +463,7 @@ dialogs_buffer_list_view_new (GimpDialogFactory *factory,
context,
32,
5, 3,
NULL);
buffers_show_context_menu);
return dialogs_dockable_new (view,
"Buffer List", "Buffers",
......@@ -601,7 +602,7 @@ dialogs_buffer_grid_view_new (GimpDialogFactory *factory,
context,
32,
5, 3,
NULL);
buffers_show_context_menu);
return dialogs_dockable_new (view,
"Buffer Grid", "Buffers",
......@@ -749,7 +750,7 @@ dialogs_document_history_new (GimpDialogFactory *factory,
context,
32,
5, 3,
NULL);
documents_show_context_menu);
return dialogs_dockable_new (view,
"Document History", "History",
......
......@@ -159,7 +159,7 @@ file_open_dialog_show (void)
gtk_file_selection_set_filename (GTK_FILE_SELECTION (fileload),
"." G_DIR_SEPARATOR_S);
gtk_window_set_title (GTK_WINDOW (fileload), _("Load Image"));
gtk_window_set_title (GTK_WINDOW (fileload), _("Open Image"));
file_dialog_show (fileload);
}
......
......@@ -12,6 +12,8 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
brush-select.h \
brushes-commands.c \
brushes-commands.h \
buffers-commands.c \
buffers-commands.h \
channels-commands.c \
channels-commands.h \
color-area.c \
......@@ -34,6 +36,8 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
dialogs-commands.h \
dialogs-constructors.c \
dialogs-constructors.h \
documents-commands.c \
documents-commands.h \
edit-commands.c \
edit-commands.h \
error-console-dialog.c \
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* 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.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "core/gimpbuffer.h"
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
#include "widgets/gimpbufferview.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimplistitem.h"
#include "widgets/gimppreview.h"
#include "widgets/gimpwidgets-utils.h"
#include "buffers-commands.h"
#include "menus.h"
#include "libgimp/gimpintl.h"
/* local function prototypes */
static void buffers_menu_set_sensitivity (GimpContainerEditor *editor);
/* public functionss */
void
buffers_paste_buffer_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpBufferView *view;
view = (GimpBufferView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->paste_button));
}
void
buffers_paste_buffer_into_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpBufferView *view;
view = (GimpBufferView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->paste_into_button));
}
void
buffers_paste_buffer_as_new_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpBufferView *view;
view = (GimpBufferView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->paste_as_new_button));
}
void
buffers_delete_buffer_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpBufferView *view;
view = (GimpBufferView *) gimp_widget_get_callback_context (widget);
if (! view)
return;
gtk_button_clicked (GTK_BUTTON (view->delete_button));
}
void
buffers_show_context_menu (GimpContainerEditor *editor)
{
GtkItemFactory *item_factory;
buffers_menu_set_sensitivity (editor);
item_factory = menus_get_buffers_factory ();
gimp_item_factory_popup_with_data (item_factory, editor);
}
/* private functions */
static void
buffers_menu_set_sensitivity (GimpContainerEditor *editor)
{
GimpBuffer *buffer;
buffer = gimp_context_get_buffer (editor->view->context);
#define SET_SENSITIVE(menu,condition) \
menus_set_sensitive ("<Buffers>/" menu, (condition) != 0)
SET_SENSITIVE ("Paste Buffer", buffer);
SET_SENSITIVE ("Paste Buffer Into", buffer);
SET_SENSITIVE ("Paste Buffer as New", buffer);
SET_SENSITIVE ("Delete Buffer", buffer);
#undef SET_SENSITIVE
}
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* 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 __BUFFERS_COMMANDS_H__
#define __BUFFERS_COMMANDS_H__
void buffers_paste_buffer_cmd_callback (GtkWidget *widget,
gpointer data);
void buffers_paste_buffer_into_cmd_callback (GtkWidget *widget,
gpointer data);
void buffers_paste_buffer_as_new_cmd_callback (GtkWidget *widget,
gpointer data);
void buffers_delete_buffer_cmd_callback (GtkWidget *widget,
gpointer data);
void buffers_show_context_menu (GimpContainerEditor *editor);
#endif /* __BUFFERS_COMMANDS_H__ */
......@@ -24,7 +24,6 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "tools/tools-types.h"
#include "core/gimp.h"
#include "core/gimpbrushgenerated.h"
......@@ -54,11 +53,13 @@
#include "brush-editor.h"
#include "brush-select.h"
#include "brushes-commands.h"
#include "buffers-commands.h"
#include "channels-commands.h"
#include "color-area.h"
#include "colormap-dialog.h"
#include "dialogs.h"
#include "dialogs-constructors.h"
#include "documents-commands.h"
#include "error-console-dialog.h"
#include "gradient-editor.h"
#include "gradient-select.h"
......@@ -462,7 +463,7 @@ dialogs_buffer_list_view_new (GimpDialogFactory *factory,
context,
32,
5, 3,
NULL);
buffers_show_context_menu);
return dialogs_dockable_new (view,
"Buffer List", "Buffers",
......@@ -601,7 +602,7 @@ dialogs_buffer_grid_view_new (GimpDialogFactory *factory,
context,
32,
5, 3,
NULL);
buffers_show_context_menu);
return dialogs_dockable_new (view,
"Buffer Grid", "Buffers",
......@@ -749,7 +750,7 @@ dialogs_document_history_new (GimpDialogFactory *factory,
context,
32,
5, 3,
NULL);
documents_show_context_menu);
return dialogs_dockable_new (view,
"Document History", "History",
......
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* 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.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "core/gimpcontainer.h"
#include "core/gimpcontext.h"
#include "core/gimpimagefile.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpdocumentview.h"
#include "widgets/gimpwidgets-utils.h"
#include "documents-commands.h"
#include "menus.h"
#include "libgimp/gimpintl.h"
/* local function prototypes */
static void documents_menu_set_sensitivity (GimpContainerEditor *editor);
/* public functionss */
void
documents_open_document_cmd_callback (GtkWidget *widget,
gpointer data)
{
GimpDocumentView *view;