Commit 83e49555 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/gimprc.[ch] app/config/gimpguiconfig.[ch] removed the

2002-02-28  Michael Natterer  <mitch@gimp.org>

	* app/gimprc.[ch]
	* app/config/gimpguiconfig.[ch]
	* app/gui/toolbox.c: removed the "show_indicators" gimprc option.
	The toolbox layout will change and thus obsolete it anyway.

	* app/gui/Makefile.am
	* app/gui/input-dialog.[ch]: removed.

	* app/gui/dialogs-constructors.[ch]
	* app/gui/dialogs.c
	* app/gui/menus.c: changed accordingly.

	* app/gui/preferences-dialog.c: Added an "Input Devices" page and
	embed the input_dialog stuff there. Put "Display" and "Monitor"
	under "Interface". Removed the "Session" page. Lots of cleanup and
	reordering of options.  Please comment...

	* themes/Default/images/preferences/Makefile.am
	* themes/Default/images/preferences/input-devices.png: new icon.
	* themes/Default/images/preferences/session.png: removed.
parent 4ba6229e
2002-02-28 Michael Natterer <mitch@gimp.org>
* app/gimprc.[ch]
* app/config/gimpguiconfig.[ch]
* app/gui/toolbox.c: removed the "show_indicators" gimprc option.
The toolbox layout will change and thus obsolete it anyway.
* app/gui/Makefile.am
* app/gui/input-dialog.[ch]: removed.
* app/gui/dialogs-constructors.[ch]
* app/gui/dialogs.c
* app/gui/menus.c: changed accordingly.
* app/gui/preferences-dialog.c: Added an "Input Devices" page and
embed the input_dialog stuff there. Put "Display" and "Monitor"
under "Interface". Removed the "Session" page. Lots of cleanup and
reordering of options. Please comment...
* themes/Default/images/preferences/Makefile.am
* themes/Default/images/preferences/input-devices.png: new icon.
* themes/Default/images/preferences/session.png: removed.
2002-02-28 Sven Neumann <sven@gimp.org>
 
* app/gui/resolution-calibrate-dialog.[ch]: take an optional pixbuf
......
......@@ -62,7 +62,6 @@ enum
PROP_SHOW_TIPS,
PROP_SHOW_TOOL_TIPS,
PROP_TEAROFF_MENUS,
PROP_SHOW_INDICATORS,
PROP_MAX_NEW_IMAGE_SIZE,
PROP_THEME_PATH,
PROP_THEME,
......@@ -161,9 +160,6 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_TEAROFF_MENUS,
"tearoff-menus",
TRUE);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_INDICATORS,
"show-indicators",
TRUE);
GIMP_CONFIG_INSTALL_PROP_MEMSIZE (object_class, PROP_MAX_NEW_IMAGE_SIZE,
"max-new-image-size",
0, G_MAXUINT, 1 << 25);
......@@ -251,9 +247,6 @@ gimp_gui_config_set_property (GObject *object,
case PROP_TEAROFF_MENUS:
gui_config->tearoff_menus = g_value_get_boolean (value);
break;
case PROP_SHOW_INDICATORS:
gui_config->show_indicators = g_value_get_boolean (value);
break;
case PROP_MAX_NEW_IMAGE_SIZE:
gui_config->max_new_image_size = g_value_get_uint (value);
break;
......@@ -335,9 +328,6 @@ gimp_gui_config_get_property (GObject *object,
case PROP_TEAROFF_MENUS:
g_value_set_boolean (value, gui_config->tearoff_menus);
break;
case PROP_SHOW_INDICATORS:
g_value_set_boolean (value, gui_config->show_indicators);
break;
case PROP_MAX_NEW_IMAGE_SIZE:
g_value_set_uint (value, gui_config->max_new_image_size);
break;
......
......@@ -55,7 +55,6 @@ struct _GimpGuiConfig
gboolean show_tips;
gboolean show_tool_tips;
gboolean tearoff_menus;
gboolean show_indicators;
guint max_new_image_size;
gchar *theme_path;
gchar *theme;
......
......@@ -69,7 +69,6 @@
#include "gradient-editor.h"
#include "gradient-select.h"
#include "gradients-commands.h"
#include "input-dialog.h"
#include "layers-commands.h"
#include "menus.h"
#include "module-browser.h"
......@@ -210,14 +209,6 @@ dialogs_preferences_get (GimpDialogFactory *factory,
return preferences_dialog_create (context->gimp);
}
GtkWidget *
dialogs_input_devices_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
return input_dialog_create (context->gimp);
}
GtkWidget *
dialogs_module_browser_get (GimpDialogFactory *factory,
GimpContext *context,
......
......@@ -44,9 +44,6 @@ GtkWidget * dialogs_palette_select_get (GimpDialogFactory *factory,
GtkWidget * dialogs_preferences_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_input_devices_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_module_browser_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
......
......@@ -46,7 +46,6 @@ static const GimpDialogFactoryEntry toplevel_entries[] =
{ "gimp:gradient-select-dialog", dialogs_gradient_select_get, 32, TRUE, TRUE, FALSE, TRUE },
{ "gimp:palette-select-dialog", dialogs_palette_select_get, 32, TRUE, TRUE, FALSE, TRUE },
{ "gimp:preferences-dialog", dialogs_preferences_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp:input-devices-dialog", dialogs_input_devices_get, 32, TRUE, 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.
......@@ -216,7 +216,6 @@ GimpRc gimprc =
/* image_title_format */ NULL,
/* image_status_format */ NULL,
/* global_paint_options */ FALSE,
/* show_indicators */ TRUE,
/* max_new_image_size */ 33554432, /* 32 MB */
/* trust_dirty_flag */ FALSE,
/* use_help */ TRUE,
......@@ -276,8 +275,6 @@ static ParseFunc funcs[] =
{ "image-title-format", TT_STRING, &gimprc.image_title_format, NULL },
{ "image-status-format", TT_STRING, &gimprc.image_status_format, NULL },
{ "global-paint-options", TT_BOOLEAN, &gimprc.global_paint_options, NULL },
{ "show-indicators", TT_BOOLEAN, &gimprc.show_indicators, NULL },
{ "dont-show-indicators", TT_BOOLEAN, NULL, &gimprc.show_indicators },
{ "no-global-paint-options", TT_BOOLEAN, NULL, &gimprc.global_paint_options },
{ "max-new-image-size", TT_MEMSIZE, &gimprc.max_new_image_size, NULL },
{ "trust-dirty-flag", TT_BOOLEAN, &gimprc.trust_dirty_flag, NULL },
......
......@@ -57,7 +57,6 @@ struct _GimpRc
gchar *image_title_format;
gchar *image_status_format;
gboolean global_paint_options;
gboolean show_indicators;
guint max_new_image_size;
gboolean trust_dirty_flag;
gboolean use_help;
......
......@@ -75,8 +75,6 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
info-dialog.h \
info-window.c \
info-window.h \
input-dialog.c \
input-dialog.h \
layers-commands.c \
layers-commands.h \
menus.c \
......
......@@ -69,7 +69,6 @@
#include "gradient-editor.h"
#include "gradient-select.h"
#include "gradients-commands.h"
#include "input-dialog.h"
#include "layers-commands.h"
#include "menus.h"
#include "module-browser.h"
......@@ -210,14 +209,6 @@ dialogs_preferences_get (GimpDialogFactory *factory,
return preferences_dialog_create (context->gimp);
}
GtkWidget *
dialogs_input_devices_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size)
{
return input_dialog_create (context->gimp);
}
GtkWidget *
dialogs_module_browser_get (GimpDialogFactory *factory,
GimpContext *context,
......
......@@ -44,9 +44,6 @@ GtkWidget * dialogs_palette_select_get (GimpDialogFactory *factory,
GtkWidget * dialogs_preferences_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_input_devices_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
GtkWidget * dialogs_module_browser_get (GimpDialogFactory *factory,
GimpContext *context,
gint preview_size);
......
......@@ -46,7 +46,6 @@ static const GimpDialogFactoryEntry toplevel_entries[] =
{ "gimp:gradient-select-dialog", dialogs_gradient_select_get, 32, TRUE, TRUE, FALSE, TRUE },
{ "gimp:palette-select-dialog", dialogs_palette_select_get, 32, TRUE, TRUE, FALSE, TRUE },
{ "gimp:preferences-dialog", dialogs_preferences_get, 32, TRUE, FALSE, FALSE, TRUE },
{ "gimp:input-devices-dialog", dialogs_input_devices_get, 32, TRUE, 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 },
......
/* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "core/gimp.h"
#include "widgets/gimpdeviceinfo.h"
#include "widgets/gimpdevices.h"
#include "device-status-dialog.h"
#include "input-dialog.h"
#include "libgimp/gimpintl.h"
/* local function prototypes */
static void input_dialog_able_callback (GtkWidget *widget,
GdkDevice *device,
Gimp *gimp);
/* private variables */
static GtkWidget *input_dialog = NULL;
/* public functions */
GtkWidget *
input_dialog_create (Gimp *gimp)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
if (input_dialog)
return input_dialog;
input_dialog = gtk_input_dialog_new ();
g_signal_connect_swapped (G_OBJECT (GTK_INPUT_DIALOG (input_dialog)->save_button),
"clicked",
G_CALLBACK (gimp_devices_save),
gimp);
g_signal_connect_swapped (G_OBJECT (GTK_INPUT_DIALOG (input_dialog)->close_button),
"clicked",
G_CALLBACK (gtk_widget_hide),
input_dialog);
g_signal_connect (G_OBJECT (input_dialog), "destroy",
G_CALLBACK (gtk_widget_destroyed),
&input_dialog);
g_signal_connect (G_OBJECT (input_dialog), "enable_device",
G_CALLBACK (input_dialog_able_callback),
gimp);
g_signal_connect (G_OBJECT (input_dialog), "disable_device",
G_CALLBACK (input_dialog_able_callback),
gimp);
/* Connect the "F1" help key */
gimp_help_connect (input_dialog,
gimp_standard_help_func,
"dialogs/input_devices.html");
return input_dialog;
}
/* private functions */
static void
input_dialog_able_callback (GtkWidget *widget,
GdkDevice *device,
Gimp *gimp)
{
gimp_device_info_changed_by_device (device);
}
/* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __INPUT_DIALOG_H__
#define __INPUT_DIALOG_H__
GtkWidget * input_dialog_create (Gimp *gimp);
void input_dialog_free (Gimp *gimp);
#endif /* __INPUT_DIALOG_H__ */
......@@ -157,6 +157,10 @@ static GimpItemFactoryEntry toolbox_entries[] =
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:tool-options-dialog",
"file/dialogs/tool_options.html", NULL },
{ { N_("/File/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:device-status-dialog",
"file/dialogs/device_status.html", NULL },
SEPARATOR ("/File/Dialogs/---"),
......@@ -221,17 +225,6 @@ static GimpItemFactoryEntry toolbox_entries[] =
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Input Devices..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:input-devices-dialog",
"file/dialogs/input_devices.html", NULL },
{ { N_("/File/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:device-status-dialog",
"file/dialogs/device_status.html", NULL },
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Document History..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp:document-history",
......@@ -857,6 +850,10 @@ static GimpItemFactoryEntry image_entries[] =
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:tool-options-dialog",
"dialogs/tool_options.html", NULL },
{ { N_("/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:device-status-dialog",
"dialogs/device_status.html", NULL },
SEPARATOR ("/Dialogs/---"),
......@@ -893,17 +890,6 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Input Devices..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:input-devices-dialog",
"dialogs/input_devices.html", NULL },
{ { N_("/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:device-status-dialog",
"dialogs/device_status.html", NULL },
SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Document History..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp:document-history",
......
This diff is collapsed.
......@@ -48,7 +48,6 @@
#include "indicator-area.h"
#include "app_procs.h"
#include "gimprc.h"
#include "libgimp/gimpintl.h"
......@@ -199,9 +198,7 @@ toolbox_create (Gimp *gimp)
0);
toolbox_create_color_area (wbox, context);
if (gimprc.show_indicators)
toolbox_create_indicator_area (wbox, context);
toolbox_create_indicator_area (wbox, context);
gtk_drag_dest_set (window,
GTK_DEST_DEFAULT_ALL,
......
......@@ -157,6 +157,10 @@ static GimpItemFactoryEntry toolbox_entries[] =
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:tool-options-dialog",
"file/dialogs/tool_options.html", NULL },
{ { N_("/File/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:device-status-dialog",
"file/dialogs/device_status.html", NULL },
SEPARATOR ("/File/Dialogs/---"),
......@@ -221,17 +225,6 @@ static GimpItemFactoryEntry toolbox_entries[] =
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Input Devices..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:input-devices-dialog",
"file/dialogs/input_devices.html", NULL },
{ { N_("/File/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:device-status-dialog",
"file/dialogs/device_status.html", NULL },
SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Document History..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp:document-history",
......@@ -857,6 +850,10 @@ static GimpItemFactoryEntry image_entries[] =
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:tool-options-dialog",
"dialogs/tool_options.html", NULL },
{ { N_("/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:device-status-dialog",
"dialogs/device_status.html", NULL },
SEPARATOR ("/Dialogs/---"),
......@@ -893,17 +890,6 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Input Devices..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:input-devices-dialog",
"dialogs/input_devices.html", NULL },
{ { N_("/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp:device-status-dialog",
"dialogs/device_status.html", NULL },
SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Document History..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
"gimp:document-history",
......
......@@ -48,7 +48,6 @@
#include "indicator-area.h"
#include "app_procs.h"
#include "gimprc.h"
#include "libgimp/gimpintl.h"
......@@ -199,9 +198,7 @@ toolbox_create (Gimp *gimp)
0);
toolbox_create_color_area (wbox, context);
if (gimprc.show_indicators)
toolbox_create_indicator_area (wbox, context);
toolbox_create_indicator_area (wbox, context);
gtk_drag_dest_set (window,
GTK_DEST_DEFAULT_ALL,
......
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