Release 2.1.2

2002-11-02  Jody Goldberg <jody@gnome.org>

	* Release 2.1.2
This commit is contained in:
Jody Goldberg 2002-11-02 19:03:15 +00:00 committed by Jody Goldberg
parent c46a90bc25
commit de3fad8d1a
75 changed files with 16433 additions and 9978 deletions

View file

@ -1,3 +1,12 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-11-02 Jody Goldberg <jody@gnome.org>
* accessibility-keyboard.c : Merge in Calum's new layout
* gnome-accessibility-keyboard-properties.glade : ditto.
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -45,28 +45,32 @@ static struct {
char const * const image_file;
char const * const gconf_key;
char const * const content [3];
gboolean always_enabled;
} const features [] = {
{ "repeatkeys_enable", "repeatkeys_image", IDIR "keyboard-repeat.png",
"/desktop/gnome/peripherals/keyboard/repeat",
{ "repeatkeys_table", NULL, NULL }, TRUE },
{ "bouncekeys_enable", "bouncekeys_image", IDIR "accessibility-keyboard-bouncekey.png",
CONFIG_ROOT "/bouncekeys_enable",
{ "bouncekey_table", NULL, NULL } },
{ "bouncekey_table", NULL, NULL }, FALSE },
{ "slowkeys_enable", "slowkeys_image", IDIR "accessibility-keyboard-slowkey.png",
CONFIG_ROOT "/slowkeys_enable",
{ "slowkeys_table", NULL, NULL } },
{ "slowkeys_table", NULL, NULL }, FALSE },
{ "mousekeys_enable", "mousekeys_image", IDIR "accessibility-keyboard-mousekey.png",
CONFIG_ROOT "/mousekeys_enable",
{ "mousekeys_table", NULL, NULL } },
{ "mousekeys_table", NULL, NULL }, FALSE },
{ "stickykeys_enable", "stickykeys_image", IDIR "accessibility-keyboard-stickykey.png",
CONFIG_ROOT "/stickykeys_enable",
{ "stickeykeys_table", NULL, NULL } },
{ "stickeykeys_table", NULL, NULL }, FALSE },
{ "togglekeys_enable", "togglekeys_image", IDIR "accessibility-keyboard-togglekey.png",
CONFIG_ROOT "/togglekeys_enable",
{ NULL, NULL, NULL } },
{ NULL, NULL, NULL }, FALSE },
{ "timeout_enable", NULL, NULL,
CONFIG_ROOT "/timeout_enable",
{ "timeout_slide", "timeout_spin", "timeout_label" } },
{ "timeout_slide", "timeout_spin", "timeout_label" }, FALSE },
{ "feature_state_change_beep", NULL, NULL,
CONFIG_ROOT "/feature_state_change_beep",
{ NULL, NULL, NULL } }
{ NULL, NULL, NULL }, FALSE }
};
static struct {
@ -78,6 +82,10 @@ static struct {
int step_size;
char const * const gconf_key;
} const ranges [] = {
{ "repeatkeys_delay_slide", "repeatkeys_delay_spin", 500, 100, 1500, 10,
"/desktop/gnome/peripherals/keyboard/delay" },
{ "repeatkeys_rate_slide", "repeatkeys_rate_spin", 90, 10, 210, 10,
"/desktop/gnome/peripherals/keyboard/rate" },
{ "bouncekeys_delay_slide", "bouncekeys_delay_spin", 300, 10, 900, 10,
CONFIG_ROOT "/bouncekeys_delay" },
{ "slowkeys_delay_slide", "slowkeys_delay_spin", 300, 10, 500, 10,
@ -221,12 +229,12 @@ setup_images (GladeXML *dialog)
}
static void
cb_launch_keyboard_capplet (GtkButton *button, GtkWidget *dialog)
cb_launch_mouse_capplet (GtkButton *button, GtkWidget *dialog)
{
GError *err = NULL;
if (!g_spawn_command_line_async ("gnome-keyboard-properties", &err))
if (!g_spawn_command_line_async ("gnome-mouse-properties", &err))
capplet_error_dialog (GTK_WINDOW (gtk_widget_get_toplevel (dialog)),
_("There was an error launching the keyboard capplet : %s"),
_("There was an error launching the mouse preferences dialog: %s"),
err);
}
@ -238,9 +246,11 @@ cb_master_enable_toggle (GtkToggleButton *btn, GladeXML *dialog)
GtkWidget *w;
while (i-- > 0) {
w = WID (features [i].checkbox);
gtk_widget_set_sensitive (w, flag);
cb_feature_toggled (GTK_TOGGLE_BUTTON (w), GINT_TO_POINTER (i));
if (!features [i].always_enabled) {
w = WID (features [i].checkbox);
gtk_widget_set_sensitive (w, flag);
cb_feature_toggled (GTK_TOGGLE_BUTTON (w), GINT_TO_POINTER (i));
}
}
}
@ -493,9 +503,9 @@ setup_accessX_dialog (GConfChangeSet *changeset)
g_signal_connect (G_OBJECT (WID ("load_CDE_file")),
"clicked",
G_CALLBACK (cb_load_CDE_file), toplevel);
g_signal_connect (G_OBJECT (WID ("launch_keyboard_capplet")),
g_signal_connect (G_OBJECT (WID ("launch_mouse_capplet")),
"clicked",
G_CALLBACK (cb_launch_keyboard_capplet), toplevel);
G_CALLBACK (cb_launch_mouse_capplet), toplevel);
return toplevel;
}

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
Fri Nov 1 11:03:34 2002 Jonathan Blandford <jrb@gnome.org>
* gnome-theme-info.[ch]: Moved theme-common, and gave more

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
Fri Nov 1 18:21:22 2002 Jonathan Blandford <jrb@gnome.org>
* main.c: remove the duplicate #defined key.

View file

@ -1,3 +1,13 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-09-27 Jody Goldberg <jody@gnome.org>
* gnome-keybinding-properties.c (cb_check_for_uniqueness) : new.
(accel_edited_callback) : don't let a user enter duplicate
accelerators for different actions.
Fri Nov 1 17:46:06 2002 Jonathan Blandford <jrb@gnome.org>
* gnome-keybinding-properties.c: move to use gnome-theme-info

View file

@ -523,6 +523,31 @@ key_theme_changed (GConfClient *client,
}
static gboolean
cb_check_for_uniqueness (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer user_data)
{
KeyEntry *key_entry;
KeyEntry *tmp_key_entry;
key_entry = (KeyEntry *)user_data;
gtk_tree_model_get (key_entry->model, iter,
KEYENTRY_COLUMN, &tmp_key_entry,
-1);
if (tmp_key_entry != NULL &&
key_entry->keyval == tmp_key_entry->keyval &&
key_entry->mask == tmp_key_entry->mask)
{
key_entry->editable = FALSE;
key_entry->gconf_key = tmp_key_entry->gconf_key;
return TRUE;
}
return FALSE;
}
static void
accel_edited_callback (GtkCellRendererText *cell,
const char *path_string,
@ -535,7 +560,7 @@ accel_edited_callback (GtkCellRendererText *cell,
GtkTreeModel *model;
GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
GtkTreeIter iter;
KeyEntry *key_entry;
KeyEntry *key_entry, tmp_key;
GError *err = NULL;
char *str;
@ -547,7 +572,34 @@ accel_edited_callback (GtkCellRendererText *cell,
/* sanity check */
if (key_entry == NULL)
{
gtk_tree_path_free (path);
return;
}
tmp_key.model = model;
tmp_key.keyval = keyval;
tmp_key.mask = mask;
tmp_key.editable = TRUE; /* kludge to stuff in a return flag */
gtk_tree_model_foreach (model, cb_check_for_uniqueness, &tmp_key);
/* flag to see if the new accelerator was in use by something */
if (!tmp_key.editable)
{
GtkWidget *dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_OK,
_("That accelerator key is already in use by: %s\n"),
key_entry->gconf_key);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
egg_cell_renderer_keys_set_accelerator (EGG_CELL_RENDERER_KEYS (cell),
key_entry->keyval, key_entry->mask);
gtk_tree_path_free (path);
return;
}
str = binding_name (keyval, mask, FALSE);

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,13 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-25 Rajkumar Sivasamy <rajkumar.siva@wipro.com>
* gnome-mouse-properties.c: Register mouse double click images
as stock icons, so that they are themable.
Fixes bug 96081
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -37,7 +37,20 @@ desktopdir = $(GNOMECC_DESKTOP_DIR)
Desktop_in_files = mouse.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
IMAGES = double-click-maybe.png double-click-off.png double-click-on.png
VARIABLES=mouse_dblclck_maybe_data $(srcdir)/double-click-maybe.png \
mouse_dblclck_on_data $(srcdir)/double-click-on.png \
mouse_dblclck_off_data $(srcdir)/double-click-off.png
BUILT_SOURCES = inlinepixbufs.h
CLEANFILES = inlinepixbufs.h
inlinepixbufs.h: $(IMAGES)
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
$(OBJECTS): inlinepixbufs.h
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA)
EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA) $(IMAGES)

View file

@ -37,11 +37,23 @@
#include "capplet-util.h"
#include "gconf-property-editor.h"
#include "activate-settings-daemon.h"
#include "inlinepixbufs.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <dirent.h>
#define MOUSE_DBLCLCK_MAYBE "mouse-dblclck-maybe"
#define MOUSE_DBLCLCK_ON "mouse-dblclck-on"
#define MOUSE_DBLCLCK_OFF "mouse-dblclck-off"
#define MOUSE_CAPPLET_DEFAULT_ICON_SIZE 100
static void mouse_init_stock_icons (void);
static void register_mouse_stock_icons (GtkIconFactory *factory);
static GtkIconSize mouse_capplet_icon_size = 0;
/******************************************************************************/
/* A quick custom widget to ensure that the left handed toggle works no matter
* which button is pressed.
@ -102,9 +114,6 @@ enum
GdkPixbuf *left_handed_pixbuf;
GdkPixbuf *right_handed_pixbuf;
GdkPixbuf *double_click_on_pixbuf;
GdkPixbuf *double_click_maybe_pixbuf;
GdkPixbuf *double_click_off_pixbuf;
GConfClient *client;
/* State in testing the double-click speed. Global for a great deal of
* convenience
@ -262,7 +271,9 @@ static gboolean
test_maybe_timeout (struct test_data_t *data)
{
double_click_state = DOUBLE_CLICK_TEST_OFF;
gtk_image_set_from_pixbuf (GTK_IMAGE (data->image), double_click_off_pixbuf);
gtk_image_set_from_stock (GTK_IMAGE (data->image),
MOUSE_DBLCLCK_OFF, mouse_capplet_icon_size);
*data->timeout_id = 0;
@ -282,9 +293,8 @@ event_box_button_press_event (GtkWidget *widget,
static guint test_on_timeout_id = 0;
static guint test_maybe_timeout_id = 0;
static guint32 double_click_timestamp = 0;
GtkWidget *image;
GdkPixbuf *pixbuf = NULL;
GtkWidget *image;
if (event->type != GDK_BUTTON_PRESS)
return FALSE;
@ -324,18 +334,19 @@ event_box_button_press_event (GtkWidget *widget,
switch (double_click_state) {
case DOUBLE_CLICK_TEST_ON:
pixbuf = double_click_on_pixbuf;
gtk_image_set_from_stock (GTK_IMAGE (image),
MOUSE_DBLCLCK_ON, mouse_capplet_icon_size);
break;
case DOUBLE_CLICK_TEST_MAYBE:
pixbuf = double_click_maybe_pixbuf;
gtk_image_set_from_stock (GTK_IMAGE (image),
MOUSE_DBLCLCK_MAYBE, mouse_capplet_icon_size);
break;
case DOUBLE_CLICK_TEST_OFF:
pixbuf = double_click_off_pixbuf;
gtk_image_set_from_stock (GTK_IMAGE (image),
MOUSE_DBLCLCK_OFF, mouse_capplet_icon_size);
break;
}
gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf);
return TRUE;
}
@ -377,18 +388,6 @@ load_pixbufs (void)
right_handed_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-on.png", TRUE, NULL);
double_click_on_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-maybe.png", TRUE, NULL);
double_click_maybe_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "double-click-off.png", TRUE, NULL);
double_click_off_pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
g_free (filename);
called = TRUE;
}
@ -542,11 +541,11 @@ setup_dialog (GladeXML *dialog, GConfChangeSet *changeset)
gconf_value_free (value);
/* Double-click time */
gtk_image_set_from_pixbuf (GTK_IMAGE (WID ("double_click_image")), double_click_off_pixbuf);
gtk_image_set_from_stock (GTK_IMAGE (WID ("double_click_image")), MOUSE_DBLCLCK_OFF, mouse_capplet_icon_size);
g_object_set_data (G_OBJECT (WID ("double_click_eventbox")), "image", WID ("double_click_image"));
g_signal_connect (WID ("double_click_eventbox"), "button_press_event",
G_CALLBACK (event_box_button_press_event), changeset);
/* Cursors page */
tree_view = WID ("cursor_tree");
cursor_font = read_cursor_font ();
@ -763,6 +762,8 @@ main (int argc, char **argv)
GNOME_PARAM_APP_DATADIR, GNOMECC_DATA_DIR,
NULL);
mouse_init_stock_icons ();
activate_settings_daemon ();
client = gconf_client_get_default ();
@ -788,3 +789,51 @@ main (int argc, char **argv)
return 0;
}
typedef struct
{
char *stock_id;
const guint8 *icon_data;
} MouseStockIcon;
static void
register_mouse_stock_icons (GtkIconFactory *factory)
{
gint i;
MouseStockIcon items[] =
{
{ MOUSE_DBLCLCK_MAYBE, mouse_dblclck_maybe_data },
{ MOUSE_DBLCLCK_ON, mouse_dblclck_on_data },
{ MOUSE_DBLCLCK_OFF, mouse_dblclck_off_data }
};
for (i = 0; i < G_N_ELEMENTS(items); ++i) {
GtkIconSet *icon_set;
GdkPixbuf *pixbuf;
pixbuf = gdk_pixbuf_new_from_inline (-1, items[i].icon_data,
FALSE, NULL);
icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
gtk_icon_set_unref (icon_set);
g_object_unref (G_OBJECT (pixbuf));
}
}
static void
mouse_init_stock_icons (void)
{
GtkIconFactory *factory;
factory = gtk_icon_factory_new ();
gtk_icon_factory_add_default (factory);
register_mouse_stock_icons (factory);
mouse_capplet_icon_size = gtk_icon_size_register ("mouse-capplet-icon",
MOUSE_CAPPLET_DEFAULT_ICON_SIZE,
MOUSE_CAPPLET_DEFAULT_ICON_SIZE);
g_object_unref (factory);
}

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,11 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-11-02 Jody Goldberg <jody@gnome.org>
* Makefile.am : Add missing file
Fri Nov 1 11:01:16 2002 Jonathan Blandford <jrb@gnome.org>
* gnome-theme-manager.c: Rewrote to handle metathemes and icon

View file

@ -6,7 +6,8 @@ gnome_theme_manager_LDADD = \
gnome_theme_manager_SOURCES = \
gnome-theme-manager.c \
gnome-theme-installer.c
gnome-theme-installer.c \
gnome-theme-installer.h
gnome_theme_manager_LDFLAGS = -export-dynamic

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-26 Havoc Pennington <hp@pobox.com>
* gnome-window-properties.c: rewrite

View file

@ -1,3 +1,7 @@
2002-11-02 Jody Goldberg <jody@gnome.org>
* Release 2.1.2
2002-10-21 Jody Goldberg <jody@gnome.org>
* Release 2.1.1