[Xfce4-commits] <ristretto:master> Cleanup Preferences Dialog
Stephan Arts
noreply at xfce.org
Fri Sep 2 23:54:02 CEST 2011
Updating branch refs/heads/master
to 42d4a996fd8e2148dc22c38820884847d5bdaaa1 (commit)
from 43bb0e2407c532178b51a9fb233d9ce42ce3fada (commit)
commit 42d4a996fd8e2148dc22c38820884847d5bdaaa1
Author: Stephan Arts <stephan at xfce.org>
Date: Fri Sep 2 23:51:32 2011 +0200
Cleanup Preferences Dialog
Remove unimplemented tabs and features
Add an option to revert the scroll-direction (some people find the oposite to the default more intuitive)
src/image_viewer.c | 33 ++++++-
src/preferences_dialog.c | 245 +++-------------------------------------------
src/settings.c | 74 ++------------
3 files changed, 52 insertions(+), 300 deletions(-)
diff --git a/src/image_viewer.c b/src/image_viewer.c
index 1470bbd..2fccef8 100644
--- a/src/image_viewer.c
+++ b/src/image_viewer.c
@@ -58,6 +58,10 @@ struct _RsttoImageViewerPriv
RsttoImageViewerOrientation orientation;
gdouble quality;
+ /* */
+ /***/
+ gboolean revert_zoom_direction;
+
/* Animation data for animated images (like .gif/.mng) */
/*******************************************************/
GdkPixbufAnimation *animation;
@@ -174,6 +178,8 @@ cb_rstto_image_viewer_button_release_event (RsttoImageViewer *viewer, GdkEventBu
static void
cb_rstto_image_viewer_bgcolor_changed (GObject *settings, GParamSpec *pspec, gpointer user_data);
+static void
+cb_rstto_image_viewer_zoom_direction_changed (GObject *settings, GParamSpec *pspec, gpointer user_data);
static void
rstto_image_viewer_load_image (RsttoImageViewer *viewer, GFile *file);
@@ -227,6 +233,7 @@ rstto_image_viewer_init(RsttoImageViewer *viewer)
g_signal_connect (G_OBJECT(viewer->priv->settings), "notify::bgcolor", G_CALLBACK (cb_rstto_image_viewer_bgcolor_changed), viewer);
g_signal_connect (G_OBJECT(viewer->priv->settings), "notify::bgcolor-override", G_CALLBACK (cb_rstto_image_viewer_bgcolor_changed), viewer);
+ g_signal_connect (G_OBJECT(viewer->priv->settings), "notify::revert-zoom-direction", G_CALLBACK (cb_rstto_image_viewer_zoom_direction_changed), viewer);
gtk_widget_set_double_buffered (GTK_WIDGET(viewer), TRUE);
@@ -1743,6 +1750,7 @@ cb_rstto_image_viewer_scroll_event (RsttoImageViewer *viewer, GdkEventScroll *ev
gint pixbuf_x_offset = 0;
gint pixbuf_y_offset = 0;
gboolean auto_scale = FALSE;
+ gboolean revert_zoom_direction = viewer->priv->revert_zoom_direction;
GtkWidget *widget = GTK_WIDGET(viewer);
@@ -1768,11 +1776,25 @@ cb_rstto_image_viewer_scroll_event (RsttoImageViewer *viewer, GdkEventScroll *ev
{
case GDK_SCROLL_UP:
case GDK_SCROLL_LEFT:
- scale = viewer->priv->scale / 1.1;
+ if (revert_zoom_direction)
+ {
+ scale = viewer->priv->scale / 1.1;
+ }
+ else
+ {
+ scale = viewer->priv->scale * 1.1;
+ }
break;
case GDK_SCROLL_DOWN:
case GDK_SCROLL_RIGHT:
- scale = viewer->priv->scale * 1.1;
+ if (revert_zoom_direction)
+ {
+ scale = viewer->priv->scale * 1.1;
+ }
+ else
+ {
+ scale = viewer->priv->scale / 1.1;
+ }
break;
}
@@ -2152,3 +2174,10 @@ cb_rstto_image_viewer_bgcolor_changed (GObject *settings, GParamSpec *pspec, gpo
RsttoImageViewer *viewer = RSTTO_IMAGE_VIEWER (user_data);
rstto_image_viewer_queued_repaint (viewer, TRUE);
}
+
+static void
+cb_rstto_image_viewer_zoom_direction_changed (GObject *settings, GParamSpec *pspec, gpointer user_data)
+{
+ RsttoImageViewer *viewer = RSTTO_IMAGE_VIEWER (user_data);
+ viewer->priv->revert_zoom_direction = rstto_settings_get_boolean_property (RSTTO_SETTINGS (settings), "revert-zoom-direction");
+}
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index 8efabe9..6746e07 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -45,22 +45,9 @@ static void
cb_rstto_preferences_dialog_bgcolor_override_toggled (GtkToggleButton *, gpointer);
static void
cb_rstto_preferences_dialog_bgcolor_color_set (GtkColorButton *, gpointer);
+
static void
-cb_rstto_preferences_dialog_cache_check_button_toggled (GtkToggleButton *, gpointer);
-static void
-cb_rstto_preferences_dialog_cache_preload_check_button_toggled (GtkToggleButton *button,
- gpointer user_data);
-static void
-cb_rstto_preferences_dialog_cache_spin_button_value_changed (GtkSpinButton *, gpointer);
-static void
-cb_rstto_preferences_dialog_image_preview_toggled (GtkToggleButton *button,
- gpointer user_data);
-static void
-cb_rstto_preferences_dialog_no_scrollwheel_action_radio_button_toggled (GtkToggleButton *, gpointer);
-static void
-cb_rstto_preferences_dialog_zoom_scrollwheel_action_radio_button_toggled (GtkToggleButton *, gpointer);
-static void
-cb_rstto_preferences_dialog_switch_scrollwheel_action_radio_button_toggled (GtkToggleButton *, gpointer );
+cb_rstto_preferences_dialog_zoom_revert_check_button_toggled (GtkToggleButton *, gpointer);
static void
cb_rstto_preferences_dialog_hide_thumbnails_fullscreen_check_button_toggled (
@@ -90,8 +77,6 @@ struct _RsttoPreferencesDialogPriv
GtkWidget *bgcolor_hbox;
GtkWidget *bgcolor_color_button;
GtkWidget *bgcolor_override_check_button;
-
- GtkWidget *image_preview_check_button;
} display_tab;
struct
@@ -108,10 +93,7 @@ struct _RsttoPreferencesDialogPriv
{
GtkWidget *scroll_frame;
GtkWidget *scroll_vbox;
- GtkWidget *no_scrollwheel_action_radio_button;
- GtkWidget *zoom_scrollwheel_action_radio_button;
- GtkWidget *switch_scrollwheel_action_radio_button;
-
+ GtkWidget *zoom_revert_check_button;
} control_tab;
struct
@@ -127,19 +109,6 @@ struct _RsttoPreferencesDialogPriv
GtkWidget *wrap_images_check_button;
} behaviour_tab;
- struct
- {
- GtkWidget *cache_frame;
- GtkWidget *cache_vbox;
- GtkWidget *cache_sub_vbox;
- GtkWidget *cache_hbox;
- GtkWidget *cache_size_label;
- GtkWidget *cache_size_unit;
- GtkWidget *cache_check_button;
- GtkWidget *cache_alignment;
- GtkWidget *cache_spin_button;
- GtkWidget *cache_preload_check_button;
- } cache_tab;
};
GType
@@ -171,9 +140,7 @@ rstto_preferences_dialog_get_type (void)
static void
rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog)
{
- guint uint_cache_size;
- gboolean bool_preload_images;
- gboolean bool_enable_cache;
+ gboolean bool_revert_zoom_direction;
gboolean bool_bgcolor_override;
gchar *scrollwheel_primary_action;
guint uint_slideshow_timeout;
@@ -202,10 +169,7 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog)
dialog->priv->settings = rstto_settings_new ();
g_object_get (G_OBJECT (dialog->priv->settings),
- "cache-size", &uint_cache_size,
- "show-preview", &bool_show_preview,
- "preload-images", &bool_preload_images,
- "enable-cache", &bool_enable_cache,
+ "revert-zoom-direction", &bool_revert_zoom_direction,
"bgcolor-override", &bool_bgcolor_override,
"bgcolor", &bgcolor,
"scrollwheel-primary-action", &scrollwheel_primary_action,
@@ -254,13 +218,6 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog)
g_signal_connect (G_OBJECT (dialog->priv->display_tab.bgcolor_color_button),
"color-set", G_CALLBACK (cb_rstto_preferences_dialog_bgcolor_color_set), dialog);
- dialog->priv->display_tab.image_preview_check_button = gtk_check_button_new_with_label (_("Show preview when loading image"));
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->display_tab.image_preview_check_button),
- bool_show_preview);
- g_signal_connect (G_OBJECT (dialog->priv->display_tab.image_preview_check_button),
- "toggled", (GCallback)cb_rstto_preferences_dialog_image_preview_toggled, dialog);
-
/*******************/
/** Slideshow tab **/
/*******************/
@@ -312,43 +269,11 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog)
dialog->priv->control_tab.scroll_frame = xfce_gtk_frame_box_new_with_content(_("Scrollwheel"), dialog->priv->control_tab.scroll_vbox);
gtk_box_pack_start (GTK_BOX (control_main_vbox), dialog->priv->control_tab.scroll_frame, FALSE, FALSE, 0);
- dialog->priv->control_tab.no_scrollwheel_action_radio_button = gtk_radio_button_new_with_label (NULL, _("No action"));
- gtk_container_add (GTK_CONTAINER (dialog->priv->control_tab.scroll_vbox), dialog->priv->control_tab.no_scrollwheel_action_radio_button);
-
-
- dialog->priv->control_tab.zoom_scrollwheel_action_radio_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (dialog->priv->control_tab.no_scrollwheel_action_radio_button), _("Zoom in and out"));
- gtk_container_add (GTK_CONTAINER (dialog->priv->control_tab.scroll_vbox), dialog->priv->control_tab.zoom_scrollwheel_action_radio_button);
-
- dialog->priv->control_tab.switch_scrollwheel_action_radio_button = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (dialog->priv->control_tab.no_scrollwheel_action_radio_button), _("Switch images"));
- gtk_container_add (GTK_CONTAINER (dialog->priv->control_tab.scroll_vbox), dialog->priv->control_tab.switch_scrollwheel_action_radio_button);
-
- if (scrollwheel_primary_action)
- {
- if (!strcmp (scrollwheel_primary_action, "zoom"))
- {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->control_tab.zoom_scrollwheel_action_radio_button), TRUE);
- }
- else if (!strcmp (scrollwheel_primary_action, "switch"))
- {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->control_tab.switch_scrollwheel_action_radio_button), TRUE);
- }
- else
- {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->control_tab.no_scrollwheel_action_radio_button), TRUE);
- }
- }
- else
- {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->control_tab.no_scrollwheel_action_radio_button), TRUE);
- }
-
+ dialog->priv->control_tab.zoom_revert_check_button = gtk_check_button_new_with_label (_("Revert zoom direction"));
+ gtk_container_add (GTK_CONTAINER (dialog->priv->control_tab.scroll_vbox), dialog->priv->control_tab.zoom_revert_check_button);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->control_tab.zoom_revert_check_button), bool_revert_zoom_direction);
- g_signal_connect (G_OBJECT (dialog->priv->control_tab.no_scrollwheel_action_radio_button),
- "toggled", (GCallback)cb_rstto_preferences_dialog_no_scrollwheel_action_radio_button_toggled, dialog);
- g_signal_connect (G_OBJECT (dialog->priv->control_tab.zoom_scrollwheel_action_radio_button),
- "toggled", (GCallback)cb_rstto_preferences_dialog_zoom_scrollwheel_action_radio_button_toggled, dialog);
- g_signal_connect (G_OBJECT (dialog->priv->control_tab.switch_scrollwheel_action_radio_button),
- "toggled", (GCallback)cb_rstto_preferences_dialog_switch_scrollwheel_action_radio_button_toggled, dialog);
+ g_signal_connect (G_OBJECT (dialog->priv->control_tab.zoom_revert_check_button), "toggled", (GCallback)cb_rstto_preferences_dialog_zoom_revert_check_button_toggled, dialog);
/*******************/
/** Behaviour tab **/
/*******************/
@@ -390,76 +315,6 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog)
-/***************/
-/** Cache tab **/
-/***************/
- cache_main_vbox = gtk_vbox_new(FALSE, 0);
- cache_main_lbl = gtk_label_new(_("Memory"));
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), cache_main_vbox, cache_main_lbl);
-
-
-/** Image-cache frame */
- dialog->priv->cache_tab.cache_vbox = gtk_vbox_new(FALSE, 0);
- dialog->priv->cache_tab.cache_frame = xfce_gtk_frame_box_new_with_content(_("Image cache"),
- dialog->priv->cache_tab.cache_vbox);
- gtk_box_pack_start (GTK_BOX (cache_main_vbox), dialog->priv->cache_tab.cache_frame, FALSE, FALSE, 0);
-
- cache_adjustment = gtk_adjustment_new (RSTTO_DEFAULT_CACHE_SIZE, RSTTO_MIN_CACHE_SIZE, 4096, 1, 0, 0);
-
- dialog->priv->cache_tab.cache_size_label = gtk_label_new (_("Cache size"));
- dialog->priv->cache_tab.cache_size_unit = gtk_label_new (_("MB"));
- dialog->priv->cache_tab.cache_hbox = gtk_hbox_new (FALSE, 4);
- dialog->priv->cache_tab.cache_sub_vbox = gtk_vbox_new (FALSE, 4);
- dialog->priv->cache_tab.cache_check_button = gtk_check_button_new_with_label (_("Enable cache"));
- dialog->priv->cache_tab.cache_alignment = gtk_alignment_new (0, 0, 1, 1);
- gtk_alignment_set_padding (GTK_ALIGNMENT (dialog->priv->cache_tab.cache_alignment), 0, 0, 20, 0);
- dialog->priv->cache_tab.cache_spin_button = gtk_spin_button_new(GTK_ADJUSTMENT(cache_adjustment), 1.0, 0);
-
- dialog->priv->cache_tab.cache_preload_check_button = gtk_check_button_new_with_label (_("Enable preloading"));
-
- gtk_box_pack_start (GTK_BOX (dialog->priv->cache_tab.cache_hbox),
- dialog->priv->cache_tab.cache_size_label, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (dialog->priv->cache_tab.cache_hbox),
- dialog->priv->cache_tab.cache_spin_button, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (dialog->priv->cache_tab.cache_hbox),
- dialog->priv->cache_tab.cache_size_unit, FALSE, FALSE, 0);
-
- gtk_box_pack_start (GTK_BOX (dialog->priv->cache_tab.cache_vbox),
- dialog->priv->cache_tab.cache_check_button, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (dialog->priv->cache_tab.cache_vbox),
- dialog->priv->cache_tab.cache_alignment, FALSE, FALSE, 0);
- gtk_container_add (GTK_CONTAINER (dialog->priv->cache_tab.cache_alignment),
- dialog->priv->cache_tab.cache_sub_vbox);
-
- gtk_box_pack_start (GTK_BOX (dialog->priv->cache_tab.cache_sub_vbox),
- dialog->priv->cache_tab.cache_hbox, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (dialog->priv->cache_tab.cache_sub_vbox),
- dialog->priv->cache_tab.cache_preload_check_button, FALSE, FALSE, 0);
-
- /* set current value */
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->cache_tab.cache_check_button),
- bool_enable_cache);
- gtk_widget_set_sensitive (GTK_WIDGET (dialog->priv->cache_tab.cache_sub_vbox),
- bool_enable_cache);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->priv->cache_tab.cache_preload_check_button),
- bool_preload_images);
- if (uint_cache_size < RSTTO_MIN_CACHE_SIZE)
- {
- gtk_adjustment_set_value (GTK_ADJUSTMENT (cache_adjustment), RSTTO_DEFAULT_CACHE_SIZE);
- }
- else
- {
- gtk_adjustment_set_value (GTK_ADJUSTMENT (cache_adjustment), uint_cache_size);
- }
-
- /* connect signals */
- g_signal_connect (G_OBJECT (dialog->priv->cache_tab.cache_check_button),
- "toggled", (GCallback)cb_rstto_preferences_dialog_cache_check_button_toggled, dialog);
- g_signal_connect (G_OBJECT (dialog->priv->cache_tab.cache_check_button),
- "toggled", (GCallback)cb_rstto_preferences_dialog_cache_preload_check_button_toggled, dialog);
- g_signal_connect (G_OBJECT (dialog->priv->cache_tab.cache_spin_button),
- "value-changed", (GCallback)cb_rstto_preferences_dialog_cache_spin_button_value_changed, dialog);
-
/********************************************/
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), notebook);
gtk_widget_show_all (notebook);
@@ -542,88 +397,12 @@ cb_rstto_preferences_dialog_bgcolor_color_set (GtkColorButton *button, gpointer
}
static void
-cb_rstto_preferences_dialog_cache_check_button_toggled (GtkToggleButton *button,
- gpointer user_data)
-{
- RsttoPreferencesDialog *dialog = RSTTO_PREFERENCES_DIALOG (user_data);
-
- GValue value = {0, };
- g_value_init (&value, G_TYPE_BOOLEAN);
-
- if (gtk_toggle_button_get_active (button))
- {
- g_value_set_boolean (&value, TRUE);
- gtk_widget_set_sensitive (GTK_WIDGET (dialog->priv->cache_tab.cache_sub_vbox), TRUE);
- }
- else
- {
- g_value_set_boolean (&value, FALSE);
- gtk_widget_set_sensitive (GTK_WIDGET (dialog->priv->cache_tab.cache_sub_vbox), FALSE);
- }
-
- g_object_set_property (G_OBJECT (dialog->priv->settings), "enable-cache", &value);
-
- g_value_unset (&value);
-
-}
-
-static void
-cb_rstto_preferences_dialog_cache_preload_check_button_toggled (GtkToggleButton *button,
- gpointer user_data)
-{
- RsttoPreferencesDialog *dialog = RSTTO_PREFERENCES_DIALOG (user_data);
-
- GValue value = {0, };
- g_value_init (&value, G_TYPE_BOOLEAN);
- if (gtk_toggle_button_get_active (button))
- {
- g_value_set_boolean (&value, TRUE);
- }
- else
- {
- g_value_set_boolean (&value, FALSE);
- }
-
- g_object_set_property (G_OBJECT (dialog->priv->settings), "preload-images", &value);
-
- g_value_unset (&value);
-}
-
-static void
-cb_rstto_preferences_dialog_cache_spin_button_value_changed (GtkSpinButton *button,
- gpointer user_data)
-{
- RsttoPreferencesDialog *dialog = RSTTO_PREFERENCES_DIALOG (user_data);
-
- GValue value = {0, };
- g_value_init (&value, G_TYPE_UINT);
-
- g_value_set_uint (&value, (guint)gtk_spin_button_get_value (button));
-
- g_object_set_property (G_OBJECT (dialog->priv->settings), "cache-size", &value);
-
- g_value_unset (&value);
-}
-
-static void
-cb_rstto_preferences_dialog_image_preview_toggled (GtkToggleButton *button,
- gpointer user_data)
+cb_rstto_preferences_dialog_zoom_revert_check_button_toggled (GtkToggleButton *button,
+ gpointer user_data)
{
RsttoPreferencesDialog *dialog = RSTTO_PREFERENCES_DIALOG (user_data);
- rstto_settings_set_boolean_property (dialog->priv->settings, "show-preview", gtk_toggle_button_get_active (button));
-}
-
-static void
-cb_rstto_preferences_dialog_no_scrollwheel_action_radio_button_toggled (GtkToggleButton *button,
- gpointer user_data)
-{
- RsttoPreferencesDialog *dialog = RSTTO_PREFERENCES_DIALOG (user_data);
-
- if (gtk_toggle_button_get_active (button))
- {
- rstto_settings_set_string_property (dialog->priv->settings, "scrollwheel-primary-action", "none");
- }
+ rstto_settings_set_boolean_property (dialog->priv->settings, "revert-zoom-direction", gtk_toggle_button_get_active(button));
}
static void
diff --git a/src/settings.c b/src/settings.c
index a9470ff..b127c48 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -57,12 +57,8 @@ enum
PROP_SHOW_NAV_TOOLBAR,
PROP_NAVBAR_POSITION,
PROP_SHOW_THUMBNAILBAR,
- PROP_SHOW_PREVIEW,
PROP_HIDE_THUMBNAILBAR_FULLSCREEN,
PROP_TOOLBAR_OPEN,
- PROP_ENABLE_CACHE,
- PROP_PRELOAD_IMAGES,
- PROP_CACHE_SIZE,
PROP_IMAGE_QUALITY,
PROP_WINDOW_WIDTH,
PROP_WINDOW_HEIGHT,
@@ -77,6 +73,7 @@ enum
PROP_WRAP_IMAGES,
PROP_THUMBNAILBAR_SIZE,
PROP_DESKTOP_TYPE,
+ PROP_REVERT_ZOOM_DIRECTION,
};
GType
@@ -112,13 +109,10 @@ struct _RsttoSettingsPriv
gboolean show_file_toolbar;
gboolean show_nav_toolbar;
gboolean show_thumbnailbar;
- gboolean show_preview;
gboolean hide_thumbnailbar_fullscreen;
gboolean open_entire_folder;
gchar *navigationbar_position;
- gboolean preload_images;
- gboolean enable_cache;
- guint cache_size;
+ gboolean revert_zoom_direction;
guint image_quality;
guint window_width;
guint window_height;
@@ -175,7 +169,6 @@ rstto_settings_init (GObject *object)
xfconf_g_property_bind (settings->priv->channel, "/window/show-thumbnailbar", G_TYPE_BOOLEAN, settings, "show-thumbnailbar");
xfconf_g_property_bind (settings->priv->channel, "/window/hide-thumbnailbar-fullscreen", G_TYPE_BOOLEAN, settings, "hide-thumbnailbar-fullscreen");
xfconf_g_property_bind (settings->priv->channel, "/window/navigationbar-position", G_TYPE_STRING, settings, "navigationbar-position");
- xfconf_g_property_bind (settings->priv->channel, "/window/show-preview", G_TYPE_BOOLEAN, settings, "show-preview");
xfconf_g_property_bind (settings->priv->channel, "/window/scrollwheel-primary-action", G_TYPE_STRING, settings, "scrollwheel-primary-action");
xfconf_g_property_bind (settings->priv->channel, "/window/scrollwheel-secondary-action", G_TYPE_STRING, settings, "scrollwheel-secondary-action");
@@ -185,9 +178,7 @@ rstto_settings_init (GObject *object)
xfconf_g_property_bind (settings->priv->channel, "/window/bgcolor-override", G_TYPE_BOOLEAN, settings, "bgcolor-override");
xfconf_g_property_bind_gdkcolor (settings->priv->channel, "/window/bgcolor-fullscreen", settings, "bgcolor-fullscreen");
- xfconf_g_property_bind (settings->priv->channel, "/image/preload", G_TYPE_BOOLEAN, settings, "preload-images");
- xfconf_g_property_bind (settings->priv->channel, "/image/cache", G_TYPE_BOOLEAN, settings, "enable-cache");
- xfconf_g_property_bind (settings->priv->channel, "/image/cache-size", G_TYPE_UINT, settings, "cache-size");
+ xfconf_g_property_bind (settings->priv->channel, "/window/revert-zoom-direction", G_TYPE_BOOLEAN, settings, "revert-zoom-direction");
xfconf_g_property_bind (settings->priv->channel, "/image/quality", G_TYPE_UINT, settings, "image-quality");
xfconf_g_property_bind (settings->priv->channel, "/image/wrap", G_TYPE_BOOLEAN, settings, "wrap-images");
xfconf_g_property_bind (settings->priv->channel, "/window/thumbnailbar/size", G_TYPE_INT, settings, "thumbnailbar-size");
@@ -285,42 +276,13 @@ rstto_settings_class_init (GObjectClass *object_class)
PROP_NAVBAR_POSITION,
pspec);
- pspec = g_param_spec_boolean ("show-preview",
+ pspec = g_param_spec_boolean ("revert-zoom-direction",
"",
"",
TRUE,
G_PARAM_READWRITE);
g_object_class_install_property (object_class,
- PROP_SHOW_PREVIEW,
- pspec);
-
- pspec = g_param_spec_boolean ("preload-images",
- "",
- "",
- TRUE,
- G_PARAM_READWRITE);
- g_object_class_install_property (object_class,
- PROP_PRELOAD_IMAGES,
- pspec);
-
- pspec = g_param_spec_boolean ("enable-cache",
- "",
- "",
- TRUE,
- G_PARAM_READWRITE);
- g_object_class_install_property (object_class,
- PROP_ENABLE_CACHE,
- pspec);
-
- pspec = g_param_spec_uint ("cache-size",
- "",
- "",
- 0,
- G_MAXUINT,
- 256,
- G_PARAM_READWRITE);
- g_object_class_install_property (object_class,
- PROP_CACHE_SIZE,
+ PROP_REVERT_ZOOM_DIRECTION,
pspec);
pspec = g_param_spec_uint ("image-quality",
@@ -537,21 +499,12 @@ rstto_settings_set_property (GObject *object,
settings->priv->navigationbar_position = g_strdup (str_val);
}
break;
- case PROP_SHOW_PREVIEW:
- settings->priv->show_preview = g_value_get_boolean (value);
- break;
- case PROP_PRELOAD_IMAGES:
- settings->priv->preload_images = g_value_get_boolean (value);
- break;
- case PROP_ENABLE_CACHE:
- settings->priv->enable_cache = g_value_get_boolean (value);
+ case PROP_REVERT_ZOOM_DIRECTION:
+ settings->priv->revert_zoom_direction = g_value_get_boolean (value);
break;
case PROP_IMAGE_QUALITY:
settings->priv->image_quality = g_value_get_uint (value);
break;
- case PROP_CACHE_SIZE:
- settings->priv->cache_size = g_value_get_uint (value);
- break;
case PROP_WINDOW_WIDTH:
settings->priv->window_width = g_value_get_uint (value);
break;
@@ -636,21 +589,12 @@ rstto_settings_get_property (GObject *object,
case PROP_NAVBAR_POSITION:
g_value_set_string (value, settings->priv->navigationbar_position);
break;
- case PROP_SHOW_PREVIEW:
- g_value_set_boolean (value, settings->priv->show_preview);
- break;
- case PROP_PRELOAD_IMAGES:
- g_value_set_boolean (value, settings->priv->preload_images);
- break;
- case PROP_ENABLE_CACHE:
- g_value_set_boolean (value, settings->priv->enable_cache);
+ case PROP_REVERT_ZOOM_DIRECTION:
+ g_value_set_boolean (value, settings->priv->revert_zoom_direction);
break;
case PROP_IMAGE_QUALITY:
g_value_set_uint (value, settings->priv->image_quality);
break;
- case PROP_CACHE_SIZE:
- g_value_set_uint (value, settings->priv->cache_size);
- break;
case PROP_WINDOW_WIDTH:
g_value_set_uint (value, settings->priv->window_width);
break;
More information about the Xfce4-commits
mailing list