Author: akv
Date: 2009-12-20 19:53:03 +0100 (Sun, 20 Dec 2009)
New Revision: 2814
Modified:
trunk/src/conf_interface.h
trunk/src/rawstudio.gtkrc
trunk/src/rs-actions.c
trunk/src/rs-library.c
trunk/src/rs-library.h
Log:
Reverted last commit.
Modified: trunk/src/conf_interface.h
===================================================================
--- trunk/src/conf_interface.h 2009-12-20 18:52:06 UTC (rev 2813)
+++ trunk/src/conf_interface.h 2009-12-20 18:53:03 UTC (rev 2814)
@@ -71,7 +71,6 @@
#define CONF_LAST_PRIORITY_PAGE "last_priority_page"
#define CONF_STORE_SORT_METHOD "store_sort_method"
#define CONF_LIBRARY_AUTOTAG "library_autotag"
-#define CONF_LENS_CORRECTION_ENABLED "lens_correction_enabled"
#define DEFAULT_CONF_EXPORT_FILENAME "%f_%2c"
#define DEFAULT_CONF_BATCH_DIRECTORY "batch_exports/"
@@ -98,7 +97,6 @@
#define DEFAULT_CONF_USE_SYSTEM_THEME FALSE
#define DEFAULT_CONF_SHOW_FILENAMES FALSE
#define DEFAULT_CONF_LIBRARY_AUTOTAG FALSE
-#define DEFAULT_CONF_LENS_CORRECTION_ENABLED FALSE
/* get the last working directory from gconf */
void rs_set_last_working_directory(const char *lwd);
Modified: trunk/src/rawstudio.gtkrc
===================================================================
--- trunk/src/rawstudio.gtkrc 2009-12-20 18:52:06 UTC (rev 2813)
+++ trunk/src/rawstudio.gtkrc 2009-12-20 18:53:03 UTC (rev 2814)
@@ -29,9 +29,6 @@
bg_pixmap[NORMAL] = "<none>"
- GtkSettings::set-menu-images = true
- GtkSettings::set-button-images = true
-
engine "clearlooks" {
}
}
@@ -39,5 +36,3 @@
widget "*" style "rawstudio-style"
class "*" style "rawstudio-style"
widget_class "*" style "rawstudio-style"
-
-
Modified: trunk/src/rs-actions.c
===================================================================
--- trunk/src/rs-actions.c 2009-12-20 18:52:06 UTC (rev 2813)
+++ trunk/src/rs-actions.c 2009-12-20 18:53:03 UTC (rev 2814)
@@ -618,28 +618,21 @@
GList * selected = rs_store_get_selected_names(rs->store);
gint num_selected = g_list_length(selected);
- gint cur, i;
+ gint cur;
if (num_selected == 0)
return;
- gchar *tagstr = g_strdup(gtk_entry_get_text(entry));
- GList *tags = rs_split_string(tagstr, " ");
- for(i = 0; i < g_list_length(tags); i++)
- {
- gchar *tag = (gchar *) g_list_nth_data(tags, i);
- rs_library_add_tag(rs->library, tag);
+ gchar *tag = g_strdup(gtk_entry_get_text(entry));
+ rs_library_add_tag(rs->library, tag);
- for(cur=0;cur<num_selected;cur++)
- rs_library_photo_add_tag(rs->library,
g_list_nth_data(selected, cur), tag, FALSE);
- g_free(tag);
- }
+ for(cur=0;cur<num_selected;cur++)
+ rs_library_photo_add_tag(rs->library, g_list_nth_data(selected,
cur), tag, FALSE);
GdkWindow *window = gtk_widget_get_parent_window(GTK_WIDGET(entry));
gdk_window_destroy(window);
- g_list_free(tags);
- g_free(tagstr);
+ g_free(tag);
g_list_free(selected);
return;
Modified: trunk/src/rs-library.c
===================================================================
--- trunk/src/rs-library.c 2009-12-20 18:52:06 UTC (rev 2813)
+++ trunk/src/rs-library.c 2009-12-20 18:53:03 UTC (rev 2814)
@@ -315,8 +315,6 @@
rc = library_create_tables(library->db);
library_sqlite_error(library->db, rc);
-
- rs_library_autotag_all_known_photos(library);
}
void
@@ -371,16 +369,7 @@
return;
}
-
-/* FIXME: function name */
void
-rs_library_photo_add_tags(RS_LIBRARY *library, gchar *filename, GList *tags,
gboolean autotag)
-{
-// rs_library_add_tag(library, metadata->make_ascii);
-// rs_library_photo_add_tag(library, photo, metadata->make_ascii,
TRUE);
-}
-
-void
rs_library_delete_photo(RS_LIBRARY *library, gchar *photo)
{
gint photo_id = -1;
@@ -677,26 +666,4 @@
return box;
}
-void
-rs_library_autotag_all_known_photos(RS_LIBRARY *library)
-{
- sqlite3 *db = library->db;
- sqlite3_stmt *stmt;
- RSMetadata *metadata = NULL;
- gchar *filename = NULL;
-
- sqlite3_prepare_v2(db, "SELECT filename FROM library;", -1, &stmt,
NULL);
- while (sqlite3_step(stmt) == SQLITE_ROW)
- {
- filename = g_strdup((gchar *) sqlite3_column_text(stmt, 0));
- metadata = rs_metadata_new_from_file(filename);
- rs_library_photo_default_tags(library, (gchar *) filename,
metadata);
- g_free(filename);
-// g_free(metadata);
- }
- sqlite3_finalize(stmt);
-
-
-}
-
/* END PUBLIC FUNCTIONS */
Modified: trunk/src/rs-library.h
===================================================================
--- trunk/src/rs-library.h 2009-12-20 18:52:06 UTC (rev 2813)
+++ trunk/src/rs-library.h 2009-12-20 18:53:03 UTC (rev 2814)
@@ -39,7 +39,6 @@
GList * rs_library_photo_tags(RS_LIBRARY *library, gchar *photo, gboolean
autotag);
GList * rs_library_find_tag(RS_LIBRARY *library, gchar *tag);
GtkWidget * rs_library_toolbox_new(RS_BLOB *rs);
-void rs_library_autotag_all_known_photos(RS_LIBRARY *library);
//void rs_library_delete_tag(gchar *filename, gchar *tag);
//void rs_library_find_tags(gchar *filename);
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
