summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Kendrick <rjek@netsurf-browser.org>2006-08-17 20:14:22 +0000
committerRob Kendrick <rjek@netsurf-browser.org>2006-08-17 20:14:22 +0000
commitf90d6dfb25cbbf7d0e9ff1aa4e4cf3fc2f5385fd (patch)
tree3f6b714ecbd69c524264a51aad8f5f90bacf395d
parent20d7717c7db4d60f69d37e563d8e424e427c53ea (diff)
downloadnetsurf-f90d6dfb25cbbf7d0e9ff1aa4e4cf3fc2f5385fd.tar.gz
netsurf-f90d6dfb25cbbf7d0e9ff1aa4e4cf3fc2f5385fd.tar.bz2
Implement default font style choice in nsgtk Choices dialogue
svn path=/trunk/netsurf/; revision=2861
-rw-r--r--gtk/gtk_options.c8
-rw-r--r--gtk/netsurf.glade3
2 files changed, 8 insertions, 3 deletions
diff --git a/gtk/gtk_options.c b/gtk/gtk_options.c
index 7dd5ac3eb..033d18115 100644
--- a/gtk/gtk_options.c
+++ b/gtk/gtk_options.c
@@ -105,6 +105,7 @@ void nsgtk_options_init(void) {
#define SET_ENTRY(x, y) gtk_entry_set_text(GTK_ENTRY((x)), (y))
#define SET_SPIN(x, y) gtk_spin_button_set_value(GTK_SPIN_BUTTON((x)), (y))
#define SET_CHECK(x, y) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON((x)), (y))
+#define SET_COMBO(x, y) gtk_combo_box_set_active(GTK_COMBO_BOX((x)), (y))
void nsgtk_options_load(void) {
char b[20];
@@ -130,6 +131,7 @@ void nsgtk_options_load(void) {
SET_CHECK(checkDisableAnimations, !option_animate_images);
/* TODO: set all font name widgets here */
+ SET_COMBO(comboDefault, option_font_default - 1);
SET_SPIN(spinDefaultSize, option_font_size / 10);
SET_SPIN(spinMinimumSize, option_font_min_size / 10);
@@ -140,7 +142,8 @@ void nsgtk_options_load(void) {
#define GET_ENTRY(x, y) if ((y)) free((y)); \
(y) = strdup(gtk_entry_get_text(GTK_ENTRY((x))))
#define GET_CHECK(x, y) (y) = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON((x)))
-#define GET_SPIN(x, y) (y) = gtk_spin_button_get_value(GTK_SPIN_BUTTON((x)));
+#define GET_SPIN(x, y) (y) = gtk_spin_button_get_value(GTK_SPIN_BUTTON((x)))
+#define GET_COMBO(x, y) (y) = gtk_combo_box_get_active(GTK_COMBO_BOX((x)))
void nsgtk_options_save(void) {
GET_ENTRY(entryHomePageURL, option_homepage_url);
@@ -149,6 +152,9 @@ void nsgtk_options_save(void) {
GET_CHECK(checkUseCairo, option_render_cairo);
GET_CHECK(checkResampleImages, option_render_resample);
+ GET_COMBO(comboDefault, option_font_default);
+ option_font_default++;
+
GET_SPIN(spinDefaultSize, option_font_size);
option_font_size *= 10;
GET_SPIN(spinMinimumSize, option_font_min_size);
diff --git a/gtk/netsurf.glade b/gtk/netsurf.glade
index 295d5d214..952413132 100644
--- a/gtk/netsurf.glade
+++ b/gtk/netsurf.glade
@@ -3550,9 +3550,8 @@ NTML authentication</property>
<child>
<widget class="GtkComboBox" id="comboDefault">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="items" translatable="yes">Sans-serif
-Sans
+Serif
Monospace
Cursive
Fantasy</property>