Author: akv
Date: 2012-04-21 21:51:45 +0200 (Sat, 21 Apr 2012)
New Revision: 4187
Added:
branches/4175-enfuse/pixmaps/overlay_enfuse.png
Removed:
branches/4175-enfuse/pixmaps/overlay_hdr.png
Modified:
branches/4175-enfuse/src/application.c
branches/4175-enfuse/src/application.h
branches/4175-enfuse/src/rs-actions.c
branches/4175-enfuse/src/rs-cache.c
branches/4175-enfuse/src/rs-cache.h
branches/4175-enfuse/src/rs-store.c
branches/4175-enfuse/src/rs-store.h
Log:
Renamed hdr to enfuse (it's more than 'hdr')
Copied: branches/4175-enfuse/pixmaps/overlay_enfuse.png (from rev 4186,
branches/4175-enfuse/pixmaps/overlay_hdr.png)
===================================================================
(Binary files differ)
Deleted: branches/4175-enfuse/pixmaps/overlay_hdr.png
===================================================================
(Binary files differ)
Modified: branches/4175-enfuse/src/application.c
===================================================================
--- branches/4175-enfuse/src/application.c 2012-04-18 21:51:19 UTC (rev
4186)
+++ branches/4175-enfuse/src/application.c 2012-04-21 19:51:45 UTC (rev
4187)
@@ -164,7 +164,7 @@
rs_cache_save(photo, MASK_ALL);
/* Set the exported flag */
- rs_store_set_flags(NULL, photo->filename, NULL, NULL, &photo->exported,
&photo->hdr);
+ rs_store_set_flags(NULL, photo->filename, NULL, NULL, &photo->exported,
&photo->enfuse);
g_object_unref(ftransform_input);
g_object_unref(ftransform_display);
Modified: branches/4175-enfuse/src/application.h
===================================================================
--- branches/4175-enfuse/src/application.h 2012-04-18 21:51:19 UTC (rev
4186)
+++ branches/4175-enfuse/src/application.h 2012-04-21 19:51:45 UTC (rev
4187)
@@ -55,7 +55,7 @@
RS_RECT *crop;
gdouble angle;
gboolean exported;
- gboolean hdr;
+ gboolean enfuse;
RSColorSpace *embedded_profile;
RSDcpFile *dcp;
RSIccProfile *icc;
Modified: branches/4175-enfuse/src/rs-actions.c
===================================================================
--- branches/4175-enfuse/src/rs-actions.c 2012-04-18 21:51:19 UTC (rev
4186)
+++ branches/4175-enfuse/src/rs-actions.c 2012-04-21 19:51:45 UTC (rev
4187)
@@ -1424,9 +1424,9 @@
g_list_free(selected_names);
rs_store_load_file(rs->store, filename);
- gboolean hdr = TRUE;
+ gboolean enfuse = TRUE;
- rs_store_set_flags(rs->store, filename, NULL, NULL, NULL, &hdr);
+ rs_store_set_flags(rs->store, filename, NULL, NULL, NULL, &enfuse);
}
Modified: branches/4175-enfuse/src/rs-cache.c
===================================================================
--- branches/4175-enfuse/src/rs-cache.c 2012-04-18 21:51:19 UTC (rev 4186)
+++ branches/4175-enfuse/src/rs-cache.c 2012-04-21 19:51:45 UTC (rev 4187)
@@ -83,8 +83,8 @@
photo->priority);
if (photo->exported)
xmlTextWriterWriteFormatElement(writer, BAD_CAST "exported",
"yes");
- if (photo->hdr)
- xmlTextWriterWriteFormatElement(writer, BAD_CAST "hdr", "yes");
+ if (photo->enfuse)
+ xmlTextWriterWriteFormatElement(writer, BAD_CAST "enfuse",
"yes");
xmlTextWriterWriteFormatElement(writer, BAD_CAST "orientation", "%d",
photo->orientation);
xmlTextWriterWriteFormatElement(writer, BAD_CAST "angle", "%f",
@@ -445,13 +445,13 @@
xmlFree(val);
}
}
- else if ((!xmlStrcmp(cur->name, BAD_CAST "hdr")))
+ else if ((!xmlStrcmp(cur->name, BAD_CAST "enfuse")))
{
val = xmlNodeListGetString(doc, cur->xmlChildrenNode,
1);
if (val)
{
if (g_ascii_strcasecmp((gchar *) val, "yes")==0)
- photo->hdr = TRUE;
+ photo->enfuse = TRUE;
xmlFree(val);
}
}
@@ -526,7 +526,7 @@
}
void
-rs_cache_load_quick(const gchar *filename, gint *priority, gboolean *exported,
gboolean *hdr)
+rs_cache_load_quick(const gchar *filename, gint *priority, gboolean *exported,
gboolean *enfuse)
{
xmlDocPtr doc;
xmlNodePtr cur;
@@ -574,11 +574,11 @@
*exported = TRUE;
xmlFree(val);
}
- if (hdr && (!xmlStrcmp(cur->name, BAD_CAST "hdr")))
+ if (enfuse && (!xmlStrcmp(cur->name, BAD_CAST "enfuse")))
{
val = xmlNodeListGetString(doc, cur->xmlChildrenNode,
1);
if (g_ascii_strcasecmp((gchar *) val, "yes")==0)
- *hdr = TRUE;
+ *enfuse = TRUE;
xmlFree(val);
}
cur = cur->next;
@@ -589,7 +589,7 @@
}
void
-rs_cache_save_flags(const gchar *filename, const guint *priority, const
gboolean *exported, const gboolean *hdr)
+rs_cache_save_flags(const gchar *filename, const guint *priority, const
gboolean *exported, const gboolean *enfuse)
{
RS_PHOTO *photo;
RSSettingsMask mask;
@@ -597,7 +597,7 @@
g_assert(filename != NULL);
- if (!(priority || exported || hdr)) return;
+ if (!(priority || exported || enfuse)) return;
/* Aquire a "fake" RS_PHOTO */
photo = rs_photo_new();
@@ -610,8 +610,8 @@
photo->priority = *priority;
if (exported)
photo->exported = *exported;
- if (hdr)
- photo->hdr = *hdr;
+ if (enfuse)
+ photo->enfuse = *enfuse;
rs_cache_save(photo, mask);
}
else
@@ -640,8 +640,8 @@
if (exported && *exported)
xmlTextWriterWriteFormatElement(writer,
BAD_CAST "exported", "yes");
- if (hdr && *hdr)
- xmlTextWriterWriteFormatElement(writer,
BAD_CAST "hdr", "yes");
+ if (enfuse && *enfuse)
+ xmlTextWriterWriteFormatElement(writer,
BAD_CAST "enfuse", "yes");
ret = xmlTextWriterEndDocument(writer);
xmlFreeTextWriter(writer);
Modified: branches/4175-enfuse/src/rs-cache.h
===================================================================
--- branches/4175-enfuse/src/rs-cache.h 2012-04-18 21:51:19 UTC (rev 4186)
+++ branches/4175-enfuse/src/rs-cache.h 2012-04-21 19:51:45 UTC (rev 4187)
@@ -27,7 +27,7 @@
extern void rs_cache_save_settings(RSSettings *rss, const RSSettingsMask mask,
xmlTextWriterPtr writer);
extern guint rs_cache_load(RS_PHOTO *photo);
extern guint rs_cache_load_setting(RSSettings *rss, xmlDocPtr doc, xmlNodePtr
cur, gint version);
-extern void rs_cache_load_quick(const gchar *filename, gint *priority,
gboolean *exported, gboolean *hdr);
-extern void rs_cache_save_flags(const gchar *filename, const guint *priority,
const gboolean *exported, const gboolean *hdr);
+extern void rs_cache_load_quick(const gchar *filename, gint *priority,
gboolean *exported, gboolean *enfuse);
+extern void rs_cache_save_flags(const gchar *filename, const guint *priority,
const gboolean *exported, const gboolean *enfuse);
#endif /* RS_CACHE_H */
Modified: branches/4175-enfuse/src/rs-store.c
===================================================================
--- branches/4175-enfuse/src/rs-store.c 2012-04-18 21:51:19 UTC (rev 4186)
+++ branches/4175-enfuse/src/rs-store.c 2012-04-21 19:51:45 UTC (rev 4187)
@@ -66,7 +66,7 @@
static GdkPixbuf *icon_priority_3 = NULL;
static GdkPixbuf *icon_priority_D = NULL;
static GdkPixbuf *icon_exported = NULL;
-static GdkPixbuf *icon_hdr = NULL;
+static GdkPixbuf *icon_enfuse = NULL;
static GdkPixbuf *icon_default = NULL;
enum {
@@ -77,7 +77,7 @@
FULLNAME_COLUMN, /* Full path to image */
PRIORITY_COLUMN,
EXPORTED_COLUMN,
- HDR_COLUMN,
+ ENFUSE_COLUMN,
METADATA_COLUMN, /* RSMetadata for image */
TYPE_COLUMN,
GROUP_LIST_COLUMN,
@@ -143,7 +143,7 @@
static gboolean scroll_event(GtkWidget *widget, GdkEventScroll *event,
gpointer user_data);
static void selection_changed(GtkIconView *iconview, gpointer data);
static void thumbnail_overlay(GdkPixbuf *pixbuf, GdkPixbuf *lowerleft,
GdkPixbuf *lowerright, GdkPixbuf *topleft, GdkPixbuf *topright, gint shadow);
-static void thumbnail_update(GdkPixbuf *pixbuf, GdkPixbuf *pixbuf_clean, gint
priority, gboolean exported, gboolean hdr, gint shadow);
+static void thumbnail_update(GdkPixbuf *pixbuf, GdkPixbuf *pixbuf_clean, gint
priority, gboolean exported, gboolean enfuse, gint shadow);
static void switch_page(GtkNotebook *notebook, GtkNotebookPage *page, guint
page_num, gpointer data);
static void selection_changed(GtkIconView *iconview, gpointer data);
static GtkWidget *make_iconview(GtkWidget *iconview, RSStore *store, gint
prio);
@@ -212,7 +212,7 @@
icon_priority_3 = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"overlay_priority3.png", NULL);
icon_priority_D = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"overlay_deleted.png", NULL);
icon_exported = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"overlay_exported.png", NULL);
- icon_hdr = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"overlay_hdr.png", NULL);
+ icon_enfuse = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"overlay_enfuse.png", NULL);
}
}
@@ -1097,11 +1097,11 @@
}
static void
-thumbnail_update(GdkPixbuf *pixbuf, GdkPixbuf *pixbuf_clean, gint priority,
gboolean exported, gboolean hdr, gint shadow)
+thumbnail_update(GdkPixbuf *pixbuf, GdkPixbuf *pixbuf_clean, gint priority,
gboolean exported, gboolean enfuse, gint shadow)
{
GdkPixbuf *icon_priority_temp;
GdkPixbuf *icon_exported_temp;
- GdkPixbuf *icon_hdr_temp;
+ GdkPixbuf *icon_enfuse_temp;
if (!pixbuf_clean)
return;
@@ -1136,12 +1136,12 @@
else
icon_exported_temp = NULL;
- if (hdr)
- icon_hdr_temp = icon_hdr;
+ if (enfuse)
+ icon_enfuse_temp = icon_enfuse;
else
- icon_hdr_temp = NULL;
+ icon_enfuse_temp = NULL;
- thumbnail_overlay(pixbuf, icon_exported_temp, icon_priority_temp,
icon_hdr_temp, NULL, shadow);
+ thumbnail_overlay(pixbuf, icon_exported_temp, icon_priority_temp,
icon_enfuse_temp, NULL, shadow);
}
static void
@@ -1495,7 +1495,7 @@
*/
gboolean
rs_store_set_flags(RSStore *store, const gchar *filename, GtkTreeIter *iter,
- const guint *priority, const gboolean *exported, const
gboolean *hdr)
+ const guint *priority, const gboolean *exported, const
gboolean *enfuse)
{
GtkTreeIter i;
@@ -1505,7 +1505,7 @@
gboolean ret = FALSE;
for (i=0;i<g_list_length(all_stores);i++)
{
- if(rs_store_set_flags(g_list_nth_data(all_stores, i),
filename, iter, priority, exported, hdr))
+ if(rs_store_set_flags(g_list_nth_data(all_stores, i),
filename, iter, priority, exported, enfuse))
ret = TRUE;
}
return ret;
@@ -1522,7 +1522,7 @@
if (iter)
{
guint prio;
- gboolean expo, hd;
+ gboolean expo, enfu;
GdkPixbuf *pixbuf;
GdkPixbuf *pixbuf_clean;
gchar *fullname;
@@ -1532,7 +1532,7 @@
PIXBUF_CLEAN_COLUMN, &pixbuf_clean,
PRIORITY_COLUMN, &prio,
EXPORTED_COLUMN, &expo,
- HDR_COLUMN, &hd,
+ ENFUSE_COLUMN, &enfu,
FULLNAME_COLUMN, &fullname,
-1);
@@ -1540,8 +1540,8 @@
prio = *priority;
if (exported)
expo = *exported;
- if (hdr)
- hd = *hdr;
+ if (enfuse)
+ enfu = *enfuse;
thumbnail_update(pixbuf, pixbuf_clean, prio, expo, hd,
DROPSHADOWOFFSET);
@@ -1551,7 +1551,7 @@
/* Update the cache */
if (priority || exported)
- rs_cache_save_flags(fullname, priority, exported, hdr);
+ rs_cache_save_flags(fullname, priority, exported, enfuse);
return TRUE;
}
@@ -2168,7 +2168,7 @@
gchar *name_full = NULL;
guint priority;
gboolean exported;
- gboolean hdr;
+ gboolean enfuse;
store_get_members(store, &iter, &members);
@@ -2182,13 +2182,13 @@
FULLNAME_COLUMN, &fullname,
PRIORITY_COLUMN, &priority,
EXPORTED_COLUMN, &exported,
- HDR_COLUMN, &hdr,
+ ENFUSE_COLUMN, &enfuse,
-1);
pixbuf_clean = store_group_update_pixbufs(pixbuf, pixbuf_clean);
pixbuf = gdk_pixbuf_copy(pixbuf_clean);
- thumbnail_update(pixbuf, pixbuf_clean, priority, exported, hdr,
DROPSHADOWOFFSET);
+ thumbnail_update(pixbuf, pixbuf_clean, priority, exported, enfuse,
DROPSHADOWOFFSET);
gtk_list_store_set (store, &iter,
PIXBUF_COLUMN, pixbuf,
@@ -2198,7 +2198,7 @@
FULLNAME_COLUMN, fullname,
PRIORITY_COLUMN, priority,
EXPORTED_COLUMN, exported,
- HDR_COLUMN, hdr,
+ ENFUSE_COLUMN, enfuse,
-1);
store_save_groups(store);
@@ -2823,7 +2823,7 @@
GtkTreeIter i;
guint prio;
gboolean expo;
- gboolean hdr;
+ gboolean enfuse;
if (!pixbuf || !filename || !store || !store->store)
return;
@@ -2838,11 +2838,11 @@
gtk_tree_model_get(GTK_TREE_MODEL(store->store), &i,
PRIORITY_COLUMN, &prio,
EXPORTED_COLUMN, &expo,
- HDR_COLUMN, &hdr,
+ ENFUSE_COLUMN, &enfuse,
-1);
gdk_threads_enter();
- thumbnail_update(pixbuf, pixbuf_clean, prio, expo, hdr,
DROPSHADOWOFFSET);
+ thumbnail_update(pixbuf, pixbuf_clean, prio, expo, enfuse,
DROPSHADOWOFFSET);
gtk_list_store_set(GTK_LIST_STORE(store->store), &i,
PIXBUF_COLUMN, pixbuf,
@@ -2860,7 +2860,7 @@
{
WORKER_JOB *job = user_data;
gboolean exported;
- gboolean hdr;
+ gboolean enfuse;
gint priority;
GdkPixbuf *pixbuf, *pixbuf_clean, *pixbuf2;
@@ -2884,10 +2884,10 @@
#endif
pixbuf_clean = gdk_pixbuf_copy(pixbuf);
- rs_cache_load_quick(job->filename, &priority, &exported, &hdr);
+ rs_cache_load_quick(job->filename, &priority, &exported, &enfuse);
/* Update thumbnail */
- thumbnail_update(pixbuf, pixbuf_clean, priority, exported, hdr,
DROPSHADOWOFFSET);
+ thumbnail_update(pixbuf, pixbuf_clean, priority, exported, enfuse,
DROPSHADOWOFFSET);
g_assert(pixbuf != NULL);
g_assert(pixbuf_clean != NULL);
@@ -2900,7 +2900,7 @@
PIXBUF_CLEAN_COLUMN, pixbuf_clean,
PRIORITY_COLUMN, priority,
EXPORTED_COLUMN, exported,
- HDR_COLUMN, hdr,
+ ENFUSE_COLUMN, enfuse,
-1);
gdk_threads_leave();
Modified: branches/4175-enfuse/src/rs-store.h
===================================================================
--- branches/4175-enfuse/src/rs-store.h 2012-04-18 21:51:19 UTC (rev 4186)
+++ branches/4175-enfuse/src/rs-store.h 2012-04-21 19:51:45 UTC (rev 4187)
@@ -79,7 +79,7 @@
*/
extern gboolean
rs_store_set_flags(RSStore *store, const gchar *filename, GtkTreeIter *iter,
- const guint *priority, const gboolean *exported, const gboolean *hdr);
+ const guint *priority, const gboolean *exported, const gboolean
*enfuse);
/**
* Update thumbnail of a file in the store
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
