Commit 0005b5d2 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/widgets/Makefile.am new files containing constructors for views on

2002-11-20  Michael Natterer  <mitch@gimp.org>

	* app/widgets/Makefile.am
	* app/widgets/gimppropwidgets.[ch]: new files containing
	constructors for views on GObject properties.

	* app/gui/Makefile.am: the build preferences-dialog again.

	* app/gui/dialogs-constructors.c
	* app/gui/dialogs.c
	* app/gui/menus.c: added it back to the dialog system (as a non
	signleton to get the new model <-> view stuff some testing).

	* app/gui/preferences-dialog.c: here it is again, using property
	view widgets. Lots of stuff removed & simplified. Some things
	still #if 0'ed and/or non-working. No saving yet, stuff...
parent 72625823
2002-11-20 Michael Natterer <mitch@gimp.org>
* app/widgets/Makefile.am
* app/widgets/gimppropwidgets.[ch]: new files containing
constructors for views on GObject properties.
* app/gui/Makefile.am: the build preferences-dialog again.
* app/gui/dialogs-constructors.c
* app/gui/dialogs.c
* app/gui/menus.c: added it back to the dialog system (as a non
signleton to get the new model <-> view stuff some testing).
* app/gui/preferences-dialog.c: here it is again, using property
view widgets. Lots of stuff removed & simplified. Some things
still #if 0'ed and/or non-working. No saving yet, stuff...
2002-11-20 Sven Neumann <sven@gimp.org>
 
* app/config/gimprc.[ch]: store the gimprc filenames in the
......
......@@ -85,7 +85,7 @@
#include "palettes-commands.h"
#include "paths-dialog.h"
#include "patterns-commands.h"
/* #include "preferences-dialog.h" */
#include "preferences-dialog.h"
#include "tips-dialog.h"
#include "tool-options-dialog.h"
#include "vectors-commands.h"
......@@ -180,8 +180,7 @@ dialogs_preferences_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
return NULL;
/* return preferences_dialog_create (context->gimp); */
return preferences_dialog_create (context->gimp);
}
GtkWidget *
......
......@@ -40,7 +40,7 @@ GimpDialogFactory *global_toolbox_factory = NULL;
static const GimpDialogFactoryEntry toplevel_entries[] =
{
{ "gimp-device-status-dialog", dialogs_device_status_get, 32, TRUE, TRUE, FALSE, TRUE },
{ "gimp-preferences-dialog", dialogs_preferences_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-preferences-dialog", dialogs_preferences_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-module-browser-dialog", dialogs_module_browser_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-undo-history-dialog", dialogs_undo_history_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE },
......
This diff is collapsed.
......@@ -95,6 +95,8 @@ libappgui_a_SOURCES = \
plug-in-commands.h \
plug-in-menus.c \
plug-in-menus.h \
preferences-dialog.c \
preferences-dialog.h \
qmask-commands.c \
qmask-commands.h \
resize-dialog.c \
......
......@@ -85,7 +85,7 @@
#include "palettes-commands.h"
#include "paths-dialog.h"
#include "patterns-commands.h"
/* #include "preferences-dialog.h" */
#include "preferences-dialog.h"
#include "tips-dialog.h"
#include "tool-options-dialog.h"
#include "vectors-commands.h"
......@@ -180,8 +180,7 @@ dialogs_preferences_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
return NULL;
/* return preferences_dialog_create (context->gimp); */
return preferences_dialog_create (context->gimp);
}
GtkWidget *
......
......@@ -40,7 +40,7 @@ GimpDialogFactory *global_toolbox_factory = NULL;
static const GimpDialogFactoryEntry toplevel_entries[] =
{
{ "gimp-device-status-dialog", dialogs_device_status_get, 32, TRUE, TRUE, FALSE, TRUE },
{ "gimp-preferences-dialog", dialogs_preferences_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-preferences-dialog", dialogs_preferences_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-module-browser-dialog", dialogs_module_browser_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp-undo-history-dialog", dialogs_undo_history_get, 32, FALSE, FALSE, FALSE, TRUE },
{ "gimp-display-filters-dialog", dialogs_display_filters_get, 32, FALSE, FALSE, FALSE, TRUE },
......
......@@ -2080,11 +2080,6 @@ menus_init (Gimp *gimp)
menus_last_opened_add (toolbox_factory, gimp);
ADD_FACTORY (toolbox_factory);
/* preferences dialog is temporarily disabled */
gimp_item_factory_set_sensitive (GTK_ITEM_FACTORY (toolbox_factory),
"/File/Preferences...",
FALSE);
image_factory = gimp_item_factory_new (gimp,
GTK_TYPE_MENU,
"<Image>", "image",
......
This diff is collapsed.
......@@ -2080,11 +2080,6 @@ menus_init (Gimp *gimp)
menus_last_opened_add (toolbox_factory, gimp);
ADD_FACTORY (toolbox_factory);
/* preferences dialog is temporarily disabled */
gimp_item_factory_set_sensitive (GTK_ITEM_FACTORY (toolbox_factory),
"/File/Preferences...",
FALSE);
image_factory = gimp_item_factory_new (gimp,
GTK_TYPE_MENU,
"<Image>", "image",
......
......@@ -135,6 +135,8 @@ libappwidgets_a_sources = \
gimppreview.h \
gimppreview-utils.c \
gimppreview-utils.h \
gimppropwidgets.c \
gimppropwidgets.h \
gimpselectioneditor.c \
gimpselectioneditor.h \
gimptoolbox.c \
......
This diff is collapsed.
/* The GIMP -- an image manipulation program
* Copyright (C) 1995-1997 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 __GIMP_PROP_WIDGETS_H__
#define __GIMP_PROP_WIDGETS_H__
GtkWidget * gimp_prop_check_button_new (GObject *config,
const gchar *property_name,
const gchar *label);
GtkWidget * gimp_prop_enum_option_menu_new (GObject *config,
const gchar *property_name,
gint minimum,
gint maximum);
GtkWidget * gimp_prop_enum_option_menu_new_with_values (GObject *config,
const gchar *property_name,
gint n_values,
...);
GtkWidget * gimp_prop_enum_option_menu_new_valist (GObject *config,
const gchar *property_name,
gint n_values,
va_list args);
GtkWidget * gimp_prop_boolean_option_menu_new (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text);
GtkWidget * gimp_prop_spin_button_new (GObject *config,
const gchar *property_name,
gdouble step_increment,
gdouble page_increment,
gint digits);
GtkWidget * gimp_prop_memsize_entry_new (GObject *config,
const gchar *property_name);
GtkTextBuffer * gimp_prop_text_buffer_new (GObject *config,
const gchar *property_name,
gint max_len);
GtkWidget * gimp_prop_file_entry_new (GObject *config,
const gchar *property_name,
const gchar *filesel_title,
gboolean dir_only,
gboolean check_valid);
GtkWidget * gimp_prop_path_editor_new (GObject *config,
const gchar *property_name,
const gchar *filesel_title);
GtkWidget * gimp_prop_coordinates_new (GObject *config,
const gchar *x_property_name,
const gchar *y_property_name,
const gchar *unit_property_name,
const gchar *unit_format,
GimpSizeEntryUpdatePolicy update_policy,
gdouble xresolution,
gdouble yresolution,
gboolean has_chainbutton);
#endif /* __GIMP_PROP_WIDGETS_H__ */
This diff is collapsed.
/* The GIMP -- an image manipulation program
* Copyright (C) 1995-1997 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 __GIMP_PROP_WIDGETS_H__
#define __GIMP_PROP_WIDGETS_H__
GtkWidget * gimp_prop_check_button_new (GObject *config,
const gchar *property_name,
const gchar *label);
GtkWidget * gimp_prop_enum_option_menu_new (GObject *config,
const gchar *property_name,
gint minimum,
gint maximum);
GtkWidget * gimp_prop_enum_option_menu_new_with_values (GObject *config,
const gchar *property_name,
gint n_values,
...);
GtkWidget * gimp_prop_enum_option_menu_new_valist (GObject *config,
const gchar *property_name,
gint n_values,
va_list args);
GtkWidget * gimp_prop_boolean_option_menu_new (GObject *config,
const gchar *property_name,
const gchar *true_text,
const gchar *false_text);
GtkWidget * gimp_prop_spin_button_new (GObject *config,
const gchar *property_name,
gdouble step_increment,
gdouble page_increment,
gint digits);
GtkWidget * gimp_prop_memsize_entry_new (GObject *config,
const gchar *property_name);
GtkTextBuffer * gimp_prop_text_buffer_new (GObject *config,
const gchar *property_name,
gint max_len);
GtkWidget * gimp_prop_file_entry_new (GObject *config,
const gchar *property_name,
const gchar *filesel_title,
gboolean dir_only,
gboolean check_valid);
GtkWidget * gimp_prop_path_editor_new (GObject *config,
const gchar *property_name,
const gchar *filesel_title);
GtkWidget * gimp_prop_coordinates_new (GObject *config,
const gchar *x_property_name,
const gchar *y_property_name,
const gchar *unit_property_name,
const gchar *unit_format,
GimpSizeEntryUpdatePolicy update_policy,
gdouble xresolution,
gdouble yresolution,
gboolean has_chainbutton);
#endif /* __GIMP_PROP_WIDGETS_H__ */
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