changeset 1353:77c3d9dcd6bc

dropped ExifUIList
author nadvornik
date Sun, 01 Mar 2009 13:37:30 +0000
parents d9197358ec5a
children d5fec01ce866
files src/advanced_exif.c src/bar_exif.h src/options.c src/pan-view.c src/preferences.c
diffstat 5 files changed, 15 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/advanced_exif.c	Sun Mar 01 11:59:32 2009 +0000
+++ b/src/advanced_exif.c	Sun Mar 01 13:37:30 2009 +0000
@@ -161,6 +161,7 @@
 	advanced_exif_update(ew);
 }
 
+#if 0
 static void advanced_exif_row_toggled_cb(GtkCellRendererToggle *toggle, const gchar *path, gpointer data)
 {
 	GtkWidget *listview = data;
@@ -199,7 +200,9 @@
 
 	g_free(name);
 }
+#endif 
 
+#if 0
 static void advanced_exif_add_column_check(GtkWidget *listview, const gchar *title, gint n)
 {
 	GtkTreeViewColumn *column;
@@ -217,6 +220,7 @@
 	g_signal_connect(G_OBJECT(renderer), "toggled",
 			 G_CALLBACK(advanced_exif_row_toggled_cb), listview);
 }
+#endif
 
 static void advanced_exif_add_column(GtkWidget *listview, const gchar *title, gint n, gint sizable)
 {
@@ -297,7 +301,7 @@
 
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(ew->listview), EXIF_ADVCOL_NAME);
 
-	advanced_exif_add_column_check(ew->listview, "", EXIF_ADVCOL_ENABLED);
+//	advanced_exif_add_column_check(ew->listview, "", EXIF_ADVCOL_ENABLED);
 
 	advanced_exif_add_column(ew->listview, _("Description"), EXIF_ADVCOL_DESCRIPTION, FALSE);
 	advanced_exif_add_column(ew->listview, _("Value"), EXIF_ADVCOL_VALUE, TRUE);
--- a/src/bar_exif.h	Sun Mar 01 11:59:32 2009 +0000
+++ b/src/bar_exif.h	Sun Mar 01 13:37:30 2009 +0000
@@ -14,22 +14,6 @@
 #ifndef BAR_EXIF_H
 #define BAR_EXIF_H
 
-#define EXIF_UI_OFF     0
-#define EXIF_UI_IFSET   1
-#define EXIF_UI_ON      2
-
-typedef struct _ExifUI ExifUI;
-struct _ExifUI {
-	gint         current;
-	gint         temp;
-	gint         default_value;
-	const gchar *key;
-};
-extern ExifUI ExifUIList[];
-
-#define EXIF_BAR_CUSTOM_COUNT 20
-
-
 GtkWidget *bar_pane_exif_new(const gchar *title, gboolean expanded, gboolean populate);
 GtkWidget *bar_pane_exif_new_from_config(const gchar **attribute_names, const gchar **attribute_values);
 void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values);
--- a/src/options.c	Sun Mar 01 11:59:32 2009 +0000
+++ b/src/options.c	Sun Mar 01 13:37:30 2009 +0000
@@ -185,9 +185,11 @@
 
 	options->shell.path = g_strdup(GQ_DEFAULT_SHELL_PATH);
 	options->shell.options = g_strdup(GQ_DEFAULT_SHELL_OPTIONS);
-	
+
+#if 0	
 	for (i = 0; ExifUIList[i].key; i++)
 		ExifUIList[i].current = ExifUIList[i].default_value;
+#endif
 }
 
 void copy_layout_options(LayoutOptions *dest, const LayoutOptions *src)
--- a/src/pan-view.c	Sun Mar 01 11:59:32 2009 +0000
+++ b/src/pan-view.c	Sun Mar 01 13:37:30 2009 +0000
@@ -1437,7 +1437,7 @@
 	if (!fd) return;
 
 	pan_text_alignment_add(ta, NULL, NULL);
-
+#if 0
 	for (i = 0; ExifUIList[i].key; i++)
 		{
 		gchar *label;
@@ -1481,8 +1481,10 @@
 			g_free(text);
 			}
 		}
+#endif
 }
 
+
 static void pan_info_update(PanWindow *pw, PanItem *pi)
 {
 	PanTextAlignment *ta;
--- a/src/preferences.c	Sun Mar 01 11:59:32 2009 +0000
+++ b/src/preferences.c	Sun Mar 01 13:37:30 2009 +0000
@@ -361,11 +361,13 @@
 	config_entry_to_option(color_profile_screen_file_entry, &options->color_profile.screen_file, NULL);
 #endif
 
+#if 0
 	for (i = 0; ExifUIList[i].key; i++)
 		{
 		ExifUIList[i].current = ExifUIList[i].temp;
 		}
 
+#endif
 	{
 	gchar *layout_order = layout_config_get(layout_widget, &new_style);
 
@@ -1489,6 +1491,7 @@
 
 	table = pref_table_new(group, 2, 2, FALSE, FALSE);
 
+#if 0
 	for (i = 0; ExifUIList[i].key; i++)
 		{
 		gchar *title;
@@ -1498,6 +1501,7 @@
 			  &ExifUIList[i].temp);
 		g_free(title);
 		}
+#endif
 }
 
 /* advanced entry tab */