diff options
| author | Don Scorgie <dscorgie@src.gnome.org> | 2006-09-29 13:34:38 +0000 |
|---|---|---|
| committer | Don Scorgie <dscorgie@src.gnome.org> | 2006-09-29 13:34:38 +0000 |
| commit | 2482f3469f0e32ebc68654e9957fcc44ce355ec9 (patch) | |
| tree | 09b7d150fe808e58af2494e45890238aa4340c68 | |
| parent | d60bfbb589b31961c241ec77bf767fc362f3f583 (diff) | |
| download | yelp-2482f3469f0e32ebc68654e9957fcc44ce355ec9.tar.gz | |
Make F7 toggle caret properly Set initial state of caret in prefs window
* src/yelp-settings.c:
* src/yelp-settings.h:
* src/yelp-window.c:
Make F7 toggle caret properly
Set initial state of caret in prefs window
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/yelp-settings.c | 15 | ||||
| -rw-r--r-- | src/yelp-settings.h | 2 | ||||
| -rw-r--r-- | src/yelp-window.c | 12 |
4 files changed, 25 insertions, 12 deletions
@@ -1,3 +1,11 @@ +2006-09-29 Don Scorgie <dscorgie@cvs.gnome.org> + + * src/yelp-settings.c: + * src/yelp-settings.h: + * src/yelp-window.c: + Make F7 toggle caret properly + Set initial state of caret in prefs window + 2006-09-17 Christian Persch <chpe@cvs.gnome.org> * src/Yelper.cpp: diff --git a/src/yelp-settings.c b/src/yelp-settings.c index 7cbf29d6..3fc2b45d 100644 --- a/src/yelp-settings.c +++ b/src/yelp-settings.c @@ -261,6 +261,9 @@ yelp_settings_open_preferences (void) gtk_font_button_set_font_name (GTK_FONT_BUTTON (fixed_font_widget), font); g_free (font); + use = gconf_client_get_bool (gconf_client, KEY_YELP_USE_CARET, NULL); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (use_caret_widget), use); + use_caret_handler = g_signal_connect (G_OBJECT (use_caret_widget), "toggled", G_CALLBACK (prefs_use_caret_cb), NULL); @@ -320,6 +323,18 @@ yelp_settings_notify_remove (YelpSettingsType type, guint id) g_hook_destroy (hook_lists[i], id); } + +void +yelp_settings_toggle_caret (void) +{ + gboolean caret; + + caret = gconf_client_get_bool (gconf_client, KEY_YELP_USE_CARET, NULL); + gconf_client_set_bool (gconf_client, + KEY_YELP_USE_CARET, + !caret, NULL); +} + /** Getters *******************************************************************/ const GtkIconTheme * diff --git a/src/yelp-settings.h b/src/yelp-settings.h index f282fa9f..8d6f1a30 100644 --- a/src/yelp-settings.h +++ b/src/yelp-settings.h @@ -99,7 +99,7 @@ gchar * yelp_settings_get_font (YelpFontType font) const gchar * yelp_settings_get_color (YelpColorType color); const gchar * yelp_settings_get_css_file (void); gboolean yelp_settings_get_caret (void); - +void yelp_settings_toggle_caret (void); void yelp_settings_params (gchar ***params, gint *params_i, gint *params_max); diff --git a/src/yelp-window.c b/src/yelp-window.c index fdadc4ec..de10350d 100644 --- a/src/yelp-window.c +++ b/src/yelp-window.c @@ -32,7 +32,6 @@ #include <gtk/gtk.h> #include <libgnomevfs/gnome-vfs.h> #include <glade/glade.h> -#include <gconf/gconf-client.h> #include <string.h> #include <libgnome/gnome-config.h> #include <libgnome/gnome-url.h> @@ -2668,16 +2667,7 @@ window_reload_cb (GtkAction *action, YelpWindow *window) static void window_enable_cursor_cb (GtkAction *action, YelpWindow *window) { - gboolean cursor; - GConfClient *gconf_client = gconf_client_get_default (); - - cursor = gconf_client_get_bool (gconf_client, - "/apps/yelp/use_caret", - NULL); - gconf_client_set_bool (gconf_client, - "/apps/yelp/use_caret", - !cursor, - NULL); + yelp_settings_toggle_caret (); } static gboolean |