[Goodies-commits] r3812 - in ristretto/trunk: . src
Stephan Arts
stephan at xfce.org
Tue Jan 15 23:19:06 CET 2008
Author: stephan
Date: 2008-01-15 22:19:06 +0000 (Tue, 15 Jan 2008)
New Revision: 3812
Modified:
ristretto/trunk/configure.in.in
ristretto/trunk/src/Makefile.am
ristretto/trunk/src/main.c
ristretto/trunk/src/navigator.c
ristretto/trunk/src/navigator.h
Log:
Revert changes made in revision 3809
Modified: ristretto/trunk/configure.in.in
===================================================================
--- ristretto/trunk/configure.in.in 2008-01-15 22:04:20 UTC (rev 3811)
+++ ristretto/trunk/configure.in.in 2008-01-15 22:19:06 UTC (rev 3812)
@@ -57,6 +57,7 @@
XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.12.0])
XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0])
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.34])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
Modified: ristretto/trunk/src/Makefile.am
===================================================================
--- ristretto/trunk/src/Makefile.am 2008-01-15 22:04:20 UTC (rev 3811)
+++ ristretto/trunk/src/Makefile.am 2008-01-15 22:19:06 UTC (rev 3812)
@@ -13,6 +13,7 @@
$(GLIB_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(LIBEXIF_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCEGUI4_CFLAGS) \
$(THUNAR_VFS_CFLAGS) \
-DDATADIR=\"$(datadir)\" \
@@ -24,6 +25,7 @@
$(GLIB_LIBS) \
$(DBUS_GLIB_LIBS) \
$(LIBEXIF_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
$(LIBXFCEGUI4_LIBS) \
$(THUNAR_VFS_LIBS)
Modified: ristretto/trunk/src/main.c
===================================================================
--- ristretto/trunk/src/main.c 2008-01-15 22:04:20 UTC (rev 3811)
+++ ristretto/trunk/src/main.c 2008-01-15 22:19:06 UTC (rev 3812)
@@ -15,9 +15,6 @@
*/
#include <config.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/stat.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <string.h>
@@ -29,17 +26,9 @@
#include "picture_viewer.h"
#include "main_window.h"
-#ifndef RISTRETTO_CONFIG_GROUP
-#define RISTRETTO_CONFIG_GROUP "Configuration"
-#endif
-
-#define RISTRETTO_DEFAULT_WINDOW_WIDTH 400
-#define RISTRETTO_DEFAULT_WINDOW_HEIGHT 300
-#define RISTRETTO_DEFAULT_SLIDESHOW_TIMEOUT 5000
-#define RISTRETTO_DEFAULT_CACHE_SIZE 128
-
static ThunarVfsMimeDatabase *mime_dbase = NULL;
+static XfceRc *xfce_rc;
static gint window_save_geometry_timer_id = 0;
static gboolean
@@ -51,8 +40,6 @@
gboolean version = FALSE;
-GKeyFile *settings = NULL;
-
static GOptionEntry entries[] =
{
{ "version", 'v', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version,
@@ -209,21 +196,9 @@
{
GdkColor *bg_color = NULL;
GError *cli_error = NULL;
- GError *config_error = NULL;
gchar *path_dir = NULL;
gint n;
- gchar *thumbnail_viewer_orientation = NULL;
- gboolean show_thumbnail_viewer = TRUE;
- gboolean show_toolbar = TRUE;
- gint window_width = 400;
- gint window_height = 300;
- gint slideshow_timeout = 5000;
- gint max_cache = 128;
- gboolean preload_during_slideshow = FALSE;
- gboolean override_bg_color = FALSE;
-
-
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@ -250,148 +225,30 @@
mime_dbase = thunar_vfs_mime_database_get_default();
- settings = g_key_file_new();
- gchar *config_filename = g_build_path("/", g_get_home_dir(), ".config", "ristretto", "ristrettorc", NULL);
gtk_window_set_default_icon_name("ristretto");
+ xfce_rc = xfce_rc_config_open(XFCE_RESOURCE_CONFIG, "ristretto/ristrettorc", FALSE);
- if(g_key_file_load_from_file(settings, config_filename, G_KEY_FILE_KEEP_COMMENTS, &config_error))
+ const gchar *thumbnail_viewer_orientation = xfce_rc_read_entry(xfce_rc, "ThumbnailViewerOrientation", "horizontal");
+ gboolean show_thumbnail_viewer = xfce_rc_read_bool_entry(xfce_rc, "ShowThumbnailViewer", TRUE);
+ gboolean show_toolbar = xfce_rc_read_bool_entry(xfce_rc, "ShowToolBar", TRUE);
+ gint window_width = xfce_rc_read_int_entry(xfce_rc, "LastWindowWidth", 400);
+ gint window_height = xfce_rc_read_int_entry(xfce_rc, "LastWindowHeight", 300);
+ gint slideshow_timeout = xfce_rc_read_int_entry(xfce_rc, "SlideShowTimeout", 5000);
+ gint max_cache = xfce_rc_read_int_entry(xfce_rc, "MaxImagesCacheSize", 128);
+ gboolean preload_during_slideshow = xfce_rc_read_bool_entry (xfce_rc, "PreloadDuringSlideShow", FALSE);
+ gboolean override_bg_color = xfce_rc_read_bool_entry (xfce_rc, "OverrideBgColor", FALSE);
+
+ if (override_bg_color)
{
- /* thumbnail viewer orientation */
- thumbnail_viewer_orientation = g_key_file_get_string(settings, RISTRETTO_CONFIG_GROUP, "ThumbnailViewerOrientation", &config_error);
- if (config_error)
+ const gchar *color = xfce_rc_read_entry(xfce_rc, "BgColor", "#000000000000");
+ bg_color = g_new0(GdkColor, 1);
+ if(!RSTTO_COLOR_PARSE(color, bg_color))
{
- if(config_error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
- {
- thumbnail_viewer_orientation = g_strdup("horizontal");
- }
- g_error_free(config_error);
- config_error = NULL;
+ g_debug("parse failed");
}
-
- /* show/hide thumbnail bar */
- show_thumbnail_viewer = g_key_file_get_boolean(settings, RISTRETTO_CONFIG_GROUP, "ShowThumbnailViewer", &config_error);
- if (config_error)
- {
- if(config_error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
- {
- show_thumbnail_viewer = TRUE;
- }
- g_error_free(config_error);
- config_error = NULL;
- }
-
- /* show toolbar */
- show_toolbar = g_key_file_get_boolean(settings, RISTRETTO_CONFIG_GROUP, "ShowToolBar", &config_error);
- if (config_error)
- {
- if(config_error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
- {
- show_toolbar = TRUE;
- }
- g_error_free(config_error);
- config_error = NULL;
- }
-
- /* window width */
- window_width = g_key_file_get_integer(settings, RISTRETTO_CONFIG_GROUP, "LastWindowWidth", &config_error);
- if (config_error)
- {
- if(config_error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
- {
- window_width = RISTRETTO_DEFAULT_WINDOW_WIDTH;
- }
- g_error_free(config_error);
- config_error = NULL;
- }
-
- /* window height */
- window_height = g_key_file_get_integer(settings, RISTRETTO_CONFIG_GROUP, "LastWindowHeight", &config_error);
- if (config_error)
- {
- if(config_error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
- {
- window_height = RISTRETTO_DEFAULT_WINDOW_HEIGHT;
- }
- g_error_free(config_error);
- config_error = NULL;
- }
-
- /* slideshow timeout */
- slideshow_timeout = g_key_file_get_integer(settings, RISTRETTO_CONFIG_GROUP, "SlideShowTimeout", &config_error);
- if (config_error)
- {
- if(config_error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
- {
- slideshow_timeout = RISTRETTO_DEFAULT_SLIDESHOW_TIMEOUT;
- }
- g_error_free(config_error);
- config_error = NULL;
- }
-
- /* max cache */
- max_cache = g_key_file_get_integer(settings, RISTRETTO_CONFIG_GROUP, "MaxImageCacheSize", &config_error);
- if (config_error)
- {
- if(config_error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
- {
- max_cache = RISTRETTO_DEFAULT_CACHE_SIZE;
- }
- g_error_free(config_error);
- config_error = NULL;
- }
-
- preload_during_slideshow = g_key_file_get_boolean(settings, RISTRETTO_CONFIG_GROUP, "PreloadDuringSlideShow", &config_error);
- if (config_error)
- {
- if(config_error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
- {
- preload_during_slideshow = FALSE;
- }
- g_error_free(config_error);
- config_error = NULL;
- }
-
- override_bg_color = g_key_file_get_boolean(settings, RISTRETTO_CONFIG_GROUP, "OverrideBgColor", &config_error);
- if (config_error)
- {
- if(config_error->code == G_KEY_FILE_ERROR_KEY_NOT_FOUND)
- {
- override_bg_color = FALSE;
- }
- g_error_free(config_error);
- config_error = NULL;
- }
-
- if(override_bg_color)
- {
- gchar *color = g_key_file_get_string(settings, RISTRETTO_CONFIG_GROUP, "BgColor", &config_error);
- if (config_error)
- {
- color = g_strdup("#000000000000");
- }
-
- bg_color = g_new0(GdkColor, 1);
- if (!RSTTO_COLOR_PARSE(color, bg_color))
- {
- g_debug("parse failed");
- }
- g_free(color);
- }
}
- else
- {
- thumbnail_viewer_orientation = g_strdup("horizontal");
- show_thumbnail_viewer = TRUE;
- show_toolbar = TRUE;
- window_width = RISTRETTO_DEFAULT_WINDOW_WIDTH;
- window_height = RISTRETTO_DEFAULT_WINDOW_HEIGHT;
- max_cache = RISTRETTO_DEFAULT_CACHE_SIZE;
- slideshow_timeout = RISTRETTO_DEFAULT_SLIDESHOW_TIMEOUT;
- preload_during_slideshow = FALSE;
- override_bg_color = FALSE;
- }
-
+
GtkWidget *window = rstto_main_window_new();
gtk_widget_ref(window);
@@ -617,70 +474,31 @@
bg_color = (GdkColor *)rstto_main_window_get_pv_bg_color(RSTTO_MAIN_WINDOW(window));
-
- g_key_file_set_boolean(settings,
- RISTRETTO_CONFIG_GROUP,
- "ShowToolBar",
- rstto_main_window_get_show_toolbar(RSTTO_MAIN_WINDOW(window)));
- g_key_file_set_boolean(settings,
- RISTRETTO_CONFIG_GROUP,
- "PreloadDuringSlideShow",
- navigator->preload);
- g_key_file_set_boolean(settings,
- RISTRETTO_CONFIG_GROUP,
- "ShowThumbnailViewer",
- rstto_main_window_get_show_thumbnail_viewer(RSTTO_MAIN_WINDOW(window)));
+ xfce_rc_write_bool_entry(xfce_rc, "ShowToolBar", rstto_main_window_get_show_toolbar(RSTTO_MAIN_WINDOW(window)));
+ xfce_rc_write_bool_entry(xfce_rc, "PreloadDuringSlideShow", navigator->preload);
+ xfce_rc_write_bool_entry(xfce_rc, "ShowThumbnailViewer", rstto_main_window_get_show_thumbnail_viewer(RSTTO_MAIN_WINDOW(window)));
if (bg_color)
{
- g_key_file_set_boolean(settings,
- RISTRETTO_CONFIG_GROUP,
- "OverrideBgColor",
- TRUE);
- g_key_file_set_string(settings,
- RISTRETTO_CONFIG_GROUP,
- "BgColor",
- RSTTO_COLOR_TO_STRING(bg_color));
+ xfce_rc_write_bool_entry(xfce_rc, "OverrideBgColor", TRUE);
+ xfce_rc_write_entry(xfce_rc, "BgColor", RSTTO_COLOR_TO_STRING(bg_color));
}
else
{
- g_key_file_set_boolean(settings,
- RISTRETTO_CONFIG_GROUP,
- "OverrideBgColor",
- FALSE);
+ xfce_rc_write_bool_entry(xfce_rc, "OverrideBgColor", FALSE);
}
-
switch (rstto_main_window_get_thumbnail_viewer_orientation(RSTTO_MAIN_WINDOW(window)))
{
case GTK_ORIENTATION_VERTICAL:
- g_key_file_set_string(settings,
- RISTRETTO_CONFIG_GROUP,
- "ThumbnailViewerOrientation",
- "vertical");
+ xfce_rc_write_entry(xfce_rc, "ThumbnailViewerOrientation", "vertical");
break;
case GTK_ORIENTATION_HORIZONTAL:
- g_key_file_set_string(settings,
- RISTRETTO_CONFIG_GROUP,
- "ThumbnailViewerOrientation",
- "horizontal");
+ xfce_rc_write_entry(xfce_rc, "ThumbnailViewerOrientation", "horizontal");
break;
}
-
- g_key_file_set_integer(settings,
- RISTRETTO_CONFIG_GROUP,
- "MaxImagesCacheSize",
- rstto_main_window_get_max_cache_size(RSTTO_MAIN_WINDOW(window)));
- g_key_file_set_integer(settings,
- RISTRETTO_CONFIG_GROUP,
- "SlideShowTimeout",
- (gint)rstto_main_window_get_slideshow_timeout(RSTTO_MAIN_WINDOW(window)));
- {
- gsize size;
- gchar *data = g_key_file_to_data(settings, &size, &config_error);
- gint fd = g_open(config_filename, O_WRONLY | O_CREAT, S_IRWXU);
- write(fd, (char *)data, size);
- close(fd);
- }
-
+ xfce_rc_write_int_entry(xfce_rc, "MaxImagesCacheSize", rstto_main_window_get_max_cache_size(RSTTO_MAIN_WINDOW(window)));
+ xfce_rc_write_int_entry(xfce_rc, "SlideShowTimeout", (gint)rstto_main_window_get_slideshow_timeout(RSTTO_MAIN_WINDOW(window)));
+ xfce_rc_flush(xfce_rc);
+ xfce_rc_close(xfce_rc);
gtk_widget_unref(window);
return 0;
}
@@ -704,8 +522,8 @@
gtk_window_get_size (GTK_WINDOW (window), &width, &height);
/* ...and remember them as default for new windows */
- g_key_file_set_integer(settings, RISTRETTO_CONFIG_GROUP, "LastWindowWidth", width);
- g_key_file_set_integer(settings, RISTRETTO_CONFIG_GROUP, "LastWindowHeight", height);
+ xfce_rc_write_int_entry (xfce_rc, "LastWindowWidth", width);
+ xfce_rc_write_int_entry (xfce_rc, "LastWindowHeight", height);
}
}
return FALSE;
Modified: ristretto/trunk/src/navigator.c
===================================================================
--- ristretto/trunk/src/navigator.c 2008-01-15 22:04:20 UTC (rev 3811)
+++ ristretto/trunk/src/navigator.c 2008-01-15 22:19:06 UTC (rev 3812)
@@ -1,6 +1,4 @@
/*
- * Copyright (C) Stephan Arts 2006-2008 <stephan at xfce.org>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
Modified: ristretto/trunk/src/navigator.h
===================================================================
--- ristretto/trunk/src/navigator.h 2008-01-15 22:04:20 UTC (rev 3811)
+++ ristretto/trunk/src/navigator.h 2008-01-15 22:19:06 UTC (rev 3812)
@@ -1,6 +1,4 @@
/*
- * Copyright (C) Stephan Arts 2006-2008 <stephan at xfce.org>
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
More information about the Goodies-commits
mailing list