Revision: 1580
http://geeqie.svn.sourceforge.net/geeqie/?rev=1580&view=rev
Author: nadvornik
Date: 2009-03-29 14:20:44 +0000 (Sun, 29 Mar 2009)
Log Message:
-----------
improved sidebar configuration
Modified Paths:
--------------
trunk/src/bar.c
trunk/src/bar.h
trunk/src/layout_util.c
trunk/src/options.c
trunk/src/rcfile.c
trunk/src/rcfile.h
trunk/src/remote.c
Modified: trunk/src/bar.c
===================================================================
--- trunk/src/bar.c 2009-03-29 10:36:13 UTC (rev 1579)
+++ trunk/src/bar.c 2009-03-29 14:20:44 UTC (rev 1580)
@@ -36,17 +36,127 @@
PaneType type;
gchar *id;
gchar *title;
+ const gchar *config;
};
+static const gchar default_config_histogram[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_histogram id = 'histogram' expanded = 'true'
histogram_channel = '4' histogram_mode = '0' />"
+" </bar>"
+" </layout>"
+"</gq>";
+
+static const gchar default_config_title[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_comment id = 'title' expanded = 'true' key = 'Xmp.dc.title'
height = '40' />"
+" </bar>"
+" </layout>"
+"</gq>";
+
+static const gchar default_config_keywords[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_keywords id = 'keywords' expanded = 'true' key = '"
KEYWORD_KEY "' />"
+" </bar>"
+" </layout>"
+"</gq>";
+
+static const gchar default_config_comment[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_comment id = 'comment' expanded = 'true' key = '"
COMMENT_KEY "' height = '150' />"
+" </bar>"
+" </layout>"
+"</gq>";
+
+static const gchar default_config_exif[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_exif id = 'exif' expanded = 'true' >"
+" <entry key = 'formatted.Camera' if_set = 'true' editable =
'false' />"
+" <entry key = 'formatted.DateTime' if_set = 'true' editable =
'false' />"
+" <entry key = 'formatted.ShutterSpeed' if_set = 'true'
editable = 'false' />"
+" <entry key = 'formatted.Aperture' if_set = 'true' editable =
'false' />"
+" <entry key = 'formatted.ExposureBias' if_set = 'true'
editable = 'false' />"
+" <entry key = 'formatted.ISOSpeedRating' if_set = 'true'
editable = 'false' />"
+" <entry key = 'formatted.FocalLength' if_set = 'true' editable
= 'false' />"
+" <entry key = 'formatted.FocalLength35mmFilm' if_set = 'true'
editable = 'false' />"
+" <entry key = 'formatted.Flash' if_set = 'true' editable =
'false' />"
+" <entry key = 'Exif.Photo.ExposureProgram' if_set = 'true'
editable = 'false' />"
+" <entry key = 'Exif.Photo.MeteringMode' if_set = 'true'
editable = 'false' />"
+" <entry key = 'Exif.Photo.LightSource' if_set = 'true'
editable = 'false' />"
+" <entry key = 'formatted.ColorProfile' if_set = 'true'
editable = 'false' />"
+" <entry key = 'formatted.SubjectDistance' if_set = 'true'
editable = 'false' />"
+" <entry key = 'formatted.Resolution' if_set = 'true' editable
= 'false' />"
+" <entry key = 'Exif.Image.Orientation' if_set = 'true'
editable = 'false' />"
+" </pane_exif>"
+" </bar>"
+" </layout>"
+"</gq>";
+
+static const gchar default_config_file_info[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_exif id = 'file_info' expanded = 'true' >"
+" <entry key = 'file.mode' if_set = 'false' editable = 'false'
/>"
+" <entry key = 'file.date' if_set = 'false' editable = 'false'
/>"
+" <entry key = 'file.size' if_set = 'false' editable = 'false'
/>"
+" </pane_exif>"
+" </bar>"
+" </layout>"
+"</gq>";
+
+static const gchar default_config_location[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_exif id = 'location' expanded = 'true' >"
+" <entry key = 'formatted.GPSPosition' if_set = 'true' editable
= 'false' />"
+" <entry key = 'formatted.GPSAltitude' if_set = 'true' editable
= 'false' />"
+" <entry key = 'Xmp.photoshop.Country' if_set = 'false'
editable = 'true' />"
+" <entry key = 'Xmp.iptc.CountryCode' if_set = 'false' editable
= 'true' />"
+" <entry key = 'Xmp.photoshop.State' if_set = 'false' editable
= 'true' />"
+" <entry key = 'Xmp.photoshop.City' if_set = 'false' editable =
'true' />"
+" <entry key = 'Xmp.iptc.Location' if_set = 'false' editable =
'true' />"
+" </pane_exif>"
+" </bar>"
+" </layout>"
+"</gq>";
+
+static const gchar default_config_copyright[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_exif id = 'copyright' expanded = 'true' >"
+" <entry key = 'Xmp.dc.creator' if_set = 'true' editable =
'false' />"
+" <entry key = 'Xmp.dc.contributor' if_set = 'true' editable =
'false' />"
+" <entry key = 'Xmp.dc.rights' if_set = 'false' editable =
'false' />"
+" </pane_exif>"
+" </bar>"
+" </layout>"
+"</gq>";
+
static const KnownPanes known_panes[] = {
/* default sidebar */
- {PANE_HISTOGRAM, "histogram", N_("Histogram")},
- {PANE_COMMENT, "title", N_("Title")},
- {PANE_KEYWORDS, "keywords", N_("Keywords")},
- {PANE_COMMENT, "comment", N_("Comment")},
- {PANE_EXIF, "exif", N_("Exif")},
+ {PANE_HISTOGRAM, "histogram", N_("Histogram"),
default_config_histogram},
+ {PANE_COMMENT, "title", N_("Title"),
default_config_title},
+ {PANE_KEYWORDS, "keywords", N_("Keywords"),
default_config_keywords},
+ {PANE_COMMENT, "comment", N_("Comment"),
default_config_comment},
+ {PANE_EXIF, "exif", N_("Exif"),
default_config_exif},
+/* other pre-configured panes */
+ {PANE_EXIF, "file_info", N_("File info"),
default_config_file_info},
+ {PANE_EXIF, "location", N_("Location"),
default_config_location},
+ {PANE_EXIF, "copyright", N_("Copyright"),
default_config_copyright},
- {PANE_UNDEF, NULL, NULL}
+ {PANE_UNDEF, NULL, NULL, NULL}
};
typedef struct _BarData BarData;
@@ -61,7 +171,7 @@
gint width;
};
-static void bar_expander_move(GtkWidget *widget, gpointer data, gboolean up)
+static void bar_expander_move(GtkWidget *widget, gpointer data, gboolean up,
gboolean single_step)
{
GtkWidget *expander = data;
GtkWidget *box;
@@ -73,8 +183,15 @@
gtk_container_child_get(GTK_CONTAINER(box), expander, "position", &pos,
NULL);
- pos = up ? (pos - 1) : (pos + 1);
- if (pos < 0) pos = 0;
+ if (single_step)
+ {
+ pos = up ? (pos - 1) : (pos + 1);
+ if (pos < 0) pos = 0;
+ }
+ else
+ {
+ pos = up ? 0 : -1;
+ }
gtk_box_reorder_child(GTK_BOX(box), expander, pos);
}
@@ -82,32 +199,105 @@
static void bar_expander_move_up_cb(GtkWidget *widget, gpointer data)
{
- bar_expander_move(widget, data, TRUE);
+ bar_expander_move(widget, data, TRUE, TRUE);
}
static void bar_expander_move_down_cb(GtkWidget *widget, gpointer data)
{
- bar_expander_move(widget, data, FALSE);
+ bar_expander_move(widget, data, FALSE, TRUE);
}
+static void bar_expander_move_top_cb(GtkWidget *widget, gpointer data)
+{
+ bar_expander_move(widget, data, TRUE, FALSE);
+}
-static void bar_expander_menu_popup(GtkWidget *data)
+static void bar_expander_move_bottom_cb(GtkWidget *widget, gpointer data)
{
+ bar_expander_move(widget, data, FALSE, FALSE);
+}
+
+static void bar_expander_delete_cb(GtkWidget *widget, gpointer data)
+{
+ GtkWidget *expander = data;
+ gtk_widget_destroy(expander);
+}
+
+static void bar_expander_add_cb(GtkWidget *widget, gpointer data)
+{
+ //GtkWidget *bar = data;
+ const KnownPanes *pane = known_panes;
+ const gchar *id = g_object_get_data(G_OBJECT(widget), "pane_add_id");
+ const gchar *config;
+
+ if (!id) return;
+
+ while (pane->id)
+ {
+ if (strcmp(pane->id, id) == 0) break;
+ pane++;
+ }
+ if (!pane->id) return;
+
+ config = bar_pane_get_default_config(id);
+ if (config) load_config_from_buf(config, strlen(config), FALSE);
+
+}
+
+
+static void bar_menu_popup(GtkWidget *widget)
+{
GtkWidget *menu;
+ GtkWidget *bar;
+ GtkWidget *expander;
+ const KnownPanes *pane = known_panes;
+ BarData *bd;
+ bd = g_object_get_data(G_OBJECT(widget), "bar_data");
+ if (bd)
+ {
+ expander = NULL;
+ bar = widget;
+ }
+ else
+ {
+ expander = widget;
+ bar = widget->parent;
+ while (bar && !g_object_get_data(G_OBJECT(bar), "bar_data"))
+ bar = bar->parent;
+ if (!bar) return;
+ }
+
menu = popup_menu_short_lived();
- menu_item_add_stock(menu, _("Move _up"), GTK_STOCK_GO_UP,
G_CALLBACK(bar_expander_move_up_cb), data);
- menu_item_add_stock(menu, _("Move _down"), GTK_STOCK_GO_DOWN,
G_CALLBACK(bar_expander_move_down_cb), data);
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, data, 0,
GDK_CURRENT_TIME);
+ if (expander)
+ {
+ menu_item_add_stock(menu, _("Move to _top"),
GTK_STOCK_GOTO_TOP, G_CALLBACK(bar_expander_move_top_cb), expander);
+ menu_item_add_stock(menu, _("Move _up"), GTK_STOCK_GO_UP,
G_CALLBACK(bar_expander_move_up_cb), expander);
+ menu_item_add_stock(menu, _("Move _down"), GTK_STOCK_GO_DOWN,
G_CALLBACK(bar_expander_move_down_cb), expander);
+ menu_item_add_stock(menu, _("Move to _bottom"),
GTK_STOCK_GOTO_BOTTOM, G_CALLBACK(bar_expander_move_bottom_cb), expander);
+ menu_item_add_divider(menu);
+ menu_item_add_stock(menu, _("Delete"), GTK_STOCK_DELETE,
G_CALLBACK(bar_expander_delete_cb), expander);
+ menu_item_add_divider(menu);
+ }
+
+ while (pane->id)
+ {
+ GtkWidget *item;
+ item = menu_item_add_stock(menu, _(pane->title), GTK_STOCK_ADD,
G_CALLBACK(bar_expander_add_cb), bar);
+ g_object_set_data(G_OBJECT(item), "pane_add_id", pane->id);
+ pane++;
+ }
+
+ gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, bar, 0,
GDK_CURRENT_TIME);
}
-static gboolean bar_expander_menu_cb(GtkWidget *widget, GdkEventButton
*bevent, gpointer data)
+static gboolean bar_menu_cb(GtkWidget *widget, GdkEventButton *bevent,
gpointer data)
{
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
- bar_expander_menu_popup(widget);
+ bar_menu_popup(widget);
return TRUE;
}
return FALSE;
@@ -288,7 +478,7 @@
gtk_box_pack_start(GTK_BOX(bd->vbox), expander, FALSE, TRUE, 0);
- g_signal_connect(expander, "button_press_event",
G_CALLBACK(bar_expander_menu_cb), bd);
+ g_signal_connect(expander, "button_press_event",
G_CALLBACK(bar_menu_cb), bd);
gtk_container_add(GTK_CONTAINER(expander), pane);
@@ -300,24 +490,17 @@
}
-static void bar_populate_default(GtkWidget *bar)
+void bar_populate_default(GtkWidget *bar)
{
- GtkWidget *widget;
+ const gchar *populate_id[] = {"histogram", "title", "keywords",
"comment", "exif", NULL};
+ const gchar **id = populate_id;
- widget = bar_pane_histogram_new("histogram", _("Histogram"), 80, TRUE,
HCHAN_RGB, 0);
- bar_add(bar, widget);
-
- widget = bar_pane_comment_new("title", _("Title"), "Xmp.dc.title",
TRUE, 40);
- bar_add(bar, widget);
-
- widget = bar_pane_keywords_new("keywords", _("Keywords"), KEYWORD_KEY,
TRUE);
- bar_add(bar, widget);
-
- widget = bar_pane_comment_new("comment", _("Comment"),
"Xmp.dc.description", TRUE, 150);
- bar_add(bar, widget);
-
- widget = bar_pane_exif_new("exif", _("Exif"), TRUE, TRUE);
- bar_add(bar, widget);
+ while (*id)
+ {
+ const gchar *config = bar_pane_get_default_config(*id);
+ if (config) load_config_from_buf(config, strlen(config), FALSE);
+ id++;
+ }
}
static void bar_size_allocate(GtkWidget *widget, GtkAllocation *allocation,
gpointer data)
@@ -373,6 +556,8 @@
g_signal_connect(G_OBJECT(bd->widget), "size-allocate",
G_CALLBACK(bar_size_allocate), bd);
+ g_signal_connect(G_OBJECT(bd->widget), "button_press_event",
G_CALLBACK(bar_menu_cb), bd);
+
bd->width = SIDEBAR_DEFAULT_WIDTH;
gtk_widget_set_size_request(bd->widget, bd->width, -1);
@@ -404,16 +589,6 @@
return bd->widget;
}
-GtkWidget *bar_new_default(LayoutWindow *lw)
-{
- GtkWidget *bar = bar_new(lw);
-
- bar_populate_default(bar);
-
- gtk_widget_show(bar);
-
- return bar;
-}
GtkWidget *bar_update_from_config(GtkWidget *bar, const gchar
**attribute_names, const gchar **attribute_values)
{
@@ -478,5 +653,18 @@
*title = g_strdup(_(pane->title));
return TRUE;
}
+
+const gchar *bar_pane_get_default_config(const gchar *id)
+{
+ const KnownPanes *pane = known_panes;
+ while (pane->id)
+ {
+ if (strcmp(pane->id, id) == 0) break;
+ pane++;
+ }
+ if (!pane->id) return NULL;
+ return pane->config;
+}
+
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
Modified: trunk/src/bar.h
===================================================================
--- trunk/src/bar.h 2009-03-29 10:36:13 UTC (rev 1579)
+++ trunk/src/bar.h 2009-03-29 14:20:44 UTC (rev 1580)
@@ -43,7 +43,6 @@
GtkWidget *bar_new(LayoutWindow *lw);
-GtkWidget *bar_new_default(LayoutWindow *lw);
GtkWidget *bar_new_from_config(LayoutWindow *lw, const gchar
**attribute_names, const gchar **attribute_values);
GtkWidget *bar_update_from_config(GtkWidget *bar, const gchar
**attribute_names, const gchar **attribute_values);
@@ -51,6 +50,8 @@
void bar_write_config(GtkWidget *bar, GString *outstr, gint indent);
+void bar_populate_default(GtkWidget *bar);
+
void bar_add(GtkWidget *bar, GtkWidget *pane);
GtkWidget *bar_find_pane_by_id(GtkWidget *bar, PaneType type, const gchar *id);
@@ -64,5 +65,7 @@
GtkWidget *bar_pane_expander_title(const gchar *title);
void bar_update_expander(GtkWidget *pane);
gboolean bar_pane_translate_title(PaneType type, const gchar *id, gchar
**title);
+const gchar *bar_pane_get_default_config(const gchar *id);
+
#endif
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
Modified: trunk/src/layout_util.c
===================================================================
--- trunk/src/layout_util.c 2009-03-29 10:36:13 UTC (rev 1579)
+++ trunk/src/layout_util.c 2009-03-29 14:20:44 UTC (rev 1580)
@@ -2030,9 +2030,11 @@
if (!lw->utility_box) return;
- bar = bar_new_default(lw);
+ bar = bar_new(lw);
layout_bar_set(lw, bar);
+
+ bar_populate_default(bar);
}
static void layout_bar_close(LayoutWindow *lw)
Modified: trunk/src/options.c
===================================================================
--- trunk/src/options.c 2009-03-29 10:36:13 UTC (rev 1579)
+++ trunk/src/options.c 2009-03-29 14:20:44 UTC (rev 1580)
@@ -247,7 +247,7 @@
sync_options_with_current_state(options);
rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
- save_options_to(rc_path, options);
+ save_config_to_file(rc_path, options);
g_free(rc_path);
}
@@ -259,13 +259,13 @@
if (isdir(GQ_SYSTEM_WIDE_DIR))
{
rc_path = g_build_filename(GQ_SYSTEM_WIDE_DIR, RC_FILE_NAME,
NULL);
- success = load_options_from(rc_path, options, TRUE);
+ success = load_config_from_file(rc_path, TRUE);
DEBUG_1("Loading options from %s ... %s", rc_path, success ?
"done" : "failed");
g_free(rc_path);
}
rc_path = g_build_filename(get_rc_dir(), RC_FILE_NAME, NULL);
- success = load_options_from(rc_path, options, TRUE);
+ success = load_config_from_file(rc_path, TRUE);
DEBUG_1("Loading options from %s ... %s", rc_path, success ? "done" :
"failed");
g_free(rc_path);
return(success);
Modified: trunk/src/rcfile.c
===================================================================
--- trunk/src/rcfile.c 2009-03-29 10:36:13 UTC (rev 1579)
+++ trunk/src/rcfile.c 2009-03-29 14:20:44 UTC (rev 1580)
@@ -486,7 +486,7 @@
*-----------------------------------------------------------------------------
*/
-gboolean save_options_to(const gchar *utf8_path, ConfOptions *options)
+gboolean save_config_to_file(const gchar *utf8_path, ConfOptions *options)
{
SecureSaveInfo *ssi;
gchar *rc_pathl;
@@ -1167,19 +1167,12 @@
*-----------------------------------------------------------------------------
*/
-gboolean load_options_from(const gchar *utf8_path, ConfOptions *options,
gboolean startup)
+gboolean load_config_from_buf(const gchar *buf, gsize size, gboolean startup)
{
- gsize size;
- gchar *buf;
GMarkupParseContext *context;
gboolean ret = TRUE;
GQParserData *parser_data;
- if (g_file_get_contents(utf8_path, &buf, &size, NULL) == FALSE)
- {
- return FALSE;
- }
-
parser_data = g_new0(GQParserData, 1);
parser_data->startup = startup;
@@ -1195,10 +1188,24 @@
g_free(parser_data);
- g_free(buf);
g_markup_parse_context_free(context);
return ret;
}
+
+gboolean load_config_from_file(const gchar *utf8_path, gboolean startup)
+{
+ gsize size;
+ gchar *buf;
+ gboolean ret = TRUE;
+
+ if (g_file_get_contents(utf8_path, &buf, &size, NULL) == FALSE)
+ {
+ return FALSE;
+ }
+ ret = load_config_from_buf(buf, size, startup);
+ g_free(buf);
+ return ret;
+}
Modified: trunk/src/rcfile.h
===================================================================
--- trunk/src/rcfile.h 2009-03-29 10:36:13 UTC (rev 1579)
+++ trunk/src/rcfile.h 2009-03-29 14:20:44 UTC (rev 1580)
@@ -73,9 +73,11 @@
void options_parse_func_set_data(GQParserData *parser_data, gpointer data);
-gboolean save_options_to(const gchar *utf8_path, ConfOptions *options);
-gboolean load_options_from(const gchar *utf8_path, ConfOptions *options,
gboolean startup);
+gboolean save_config_to_file(const gchar *utf8_path, ConfOptions *options);
+gboolean load_config_from_buf(const gchar *buf, gsize size, gboolean startup);
+gboolean load_config_from_file(const gchar *utf8_path, gboolean startup);
+
#endif
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
Modified: trunk/src/remote.c
===================================================================
--- trunk/src/remote.c 2009-03-29 10:36:13 UTC (rev 1579)
+++ trunk/src/remote.c 2009-03-29 14:20:44 UTC (rev 1580)
@@ -506,7 +506,7 @@
if (isfile(filename))
{
- load_options_from(filename, options, FALSE);
+ load_config_from_file(filename, FALSE);
}
else
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
