diff options
author | Vincent Sanders <vince@kyllikki.org> | 2014-06-09 13:10:56 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2014-06-09 13:13:59 +0100 |
commit | 8e29e517d59f0d04dd2d09c6b8760aa1236a1abf (patch) | |
tree | fc126b0fb960def166be113827733d367f6fc9bb /gtk | |
parent | e687a359c702e13a7f3e7bb5ba8e7b76d32283b1 (diff) | |
download | netsurf-8e29e517d59f0d04dd2d09c6b8760aa1236a1abf.tar.gz netsurf-8e29e517d59f0d04dd2d09c6b8760aa1236a1abf.tar.bz2 |
fix disc cache size option to be unsigned
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/dialogs/preferences.c | 23 | ||||
-rw-r--r-- | gtk/res/options.gtk2.ui | 8 | ||||
-rw-r--r-- | gtk/res/options.gtk3.ui | 6 |
3 files changed, 29 insertions, 8 deletions
diff --git a/gtk/dialogs/preferences.c b/gtk/dialogs/preferences.c index f80500dfa..58bb8b4d9 100644 --- a/gtk/dialogs/preferences.c +++ b/gtk/dialogs/preferences.c @@ -108,6 +108,27 @@ nsgtk_preferences_##WIDGET##_realize(GtkWidget *widget, struct ppref *priv) \ ((gdouble)nsoption_int(OPTION)) / MULTIPLIER); \ } +#define SPINBUTTON_UINT_SIGNALS(WIDGET, OPTION, MULTIPLIER) \ +G_MODULE_EXPORT void \ +nsgtk_preferences_##WIDGET##_valuechanged(GtkSpinButton *spinbutton, \ + struct ppref *priv); \ +G_MODULE_EXPORT void \ +nsgtk_preferences_##WIDGET##_valuechanged(GtkSpinButton *spinbutton, \ + struct ppref *priv) \ +{ \ + nsoption_set_uint(OPTION, \ + round(gtk_spin_button_get_value(spinbutton) * MULTIPLIER)); \ +} \ + \ +G_MODULE_EXPORT void \ +nsgtk_preferences_##WIDGET##_realize(GtkWidget *widget, struct ppref *priv); \ +G_MODULE_EXPORT void \ +nsgtk_preferences_##WIDGET##_realize(GtkWidget *widget, struct ppref *priv) \ +{ \ + gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), \ + ((gdouble)nsoption_uint(OPTION)) / MULTIPLIER); \ +} + #define ENTRY_SIGNALS(WIDGET, OPTION) \ G_MODULE_EXPORT void \ nsgtk_preferences_##WIDGET##_changed(GtkEditable *editable, struct ppref *priv); \ @@ -372,7 +393,7 @@ SPINBUTTON_SIGNALS(spinHistoryAge, history_age, 1.0) SPINBUTTON_SIGNALS(spinMemoryCacheSize, memory_cache_size, (1024*1024)) /* disc cache size */ -SPINBUTTON_SIGNALS(spinDiscCacheSize, disc_cache_size, (1024*1024)) +SPINBUTTON_UINT_SIGNALS(spinDiscCacheSize, disc_cache_size, (1024*1024)) /* disc cache age */ diff --git a/gtk/res/options.gtk2.ui b/gtk/res/options.gtk2.ui index ebe7b91f5..b0d45bb2f 100644 --- a/gtk/res/options.gtk2.ui +++ b/gtk/res/options.gtk2.ui @@ -2653,10 +2653,10 @@ <property name="page_increment">16</property> </object> <object class="GtkAdjustment" id="adjustment_cache_disc_size"> - <property name="value">16</property> - <property name="upper">2048</property> - <property name="step_increment">4</property> - <property name="page_increment">16</property> + <property name="value">1024</property> + <property name="upper">4096</property> + <property name="step_increment">32</property> + <property name="page_increment">256</property> </object> <object class="GtkAdjustment" id="adjustment_disc_cache_age"> <property name="value">28</property> diff --git a/gtk/res/options.gtk3.ui b/gtk/res/options.gtk3.ui index a795c2bf5..02e4df47c 100644 --- a/gtk/res/options.gtk3.ui +++ b/gtk/res/options.gtk3.ui @@ -9,13 +9,13 @@ <property name="page_increment">1</property> </object> <object class="GtkAdjustment" id="adjustment_cache_disc_size"> - <property name="upper">2048</property> - <property name="value">16</property> + <property name="upper">4096</property> + <property name="value">1024</property> <property name="step_increment">4</property> <property name="page_increment">16</property> </object> <object class="GtkAdjustment" id="adjustment_cache_memory_size"> - <property name="upper">2048</property> + <property name="upper">1024</property> <property name="value">16</property> <property name="step_increment">4</property> <property name="page_increment">16</property> |