/*
* Geeqie
* (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: Vladimir Nadvornik
*
#include "bar_keywords.h"
#include "bar_exif.h"
#include "bar_histogram.h"
+#include "histogram.h"
#include "rcfile.h"
+#include "bar_gps.h"
-#define BAR_SIZE_INCREMENT 48
-#define BAR_ARROW_SIZE 7
+typedef struct _KnownPanes KnownPanes;
+struct _KnownPanes
+{
+ 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 = '" ORIENTATION_KEY "' 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>";
+
+#ifdef HAVE_LIBCHAMPLAIN
+#ifdef HAVE_LIBCHAMPLAIN_GTK
+static const gchar default_config_gps[] =
+"<gq>"
+" <layout id = '_current_'>"
+" <bar>"
+" <pane_gps id = 'gps' expanded = 'true'"
+" map-id = 'osm::mapnik'"
+" zoom-level = '8'"
+" latitude = '50116666'"
+" longitude = '8683333' />"
+" </bar>"
+" </layout>"
+"</gq>";
+#endif
+#endif
+
+static const KnownPanes known_panes[] = {
+/* default sidebar */
+ {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 and GPS"), default_config_location},
+ {PANE_EXIF, "copyright", N_("Copyright"), default_config_copyright},
+#ifdef HAVE_LIBCHAMPLAIN
+#ifdef HAVE_LIBCHAMPLAIN_GTK
+ {PANE_GPS, "gps", N_("GPS Map"), default_config_gps},
+#endif
+#endif
+ {PANE_UNDEF, NULL, NULL, NULL}
+};
typedef struct _BarData BarData;
struct _BarData
FileData *fd;
GtkWidget *label_file_name;
- GList *(*list_func)(gpointer);
- gpointer list_data;
+ LayoutWindow *lw;
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;
gint pos;
+
if (!expander) return;
box = gtk_widget_get_ancestor(expander, GTK_TYPE_BOX);
if (!box) return;
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);
}
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_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_menu_popup(GtkWidget *data)
+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 = gtk_widget_get_parent(widget);
+ while (bar && !g_object_get_data(G_OBJECT(bar), "bar_data"))
+ bar = gtk_widget_get_parent(bar);
+ 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, _("Remove"), 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;
-}
+}
-void bar_pane_set_fd_cb(GtkWidget *expander, gpointer data)
+static void bar_pane_set_fd_cb(GtkWidget *expander, gpointer data)
{
GtkWidget *widget = gtk_bin_get_child(GTK_BIN(expander));
PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
}
-gint bar_event(GtkWidget *bar, GdkEvent *event)
+static void bar_pane_notify_selection_cb(GtkWidget *expander, gpointer data)
+{
+ GtkWidget *widget = gtk_bin_get_child(GTK_BIN(expander));
+ PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
+ if (!pd) return;
+ if (pd->pane_notify_selection) pd->pane_notify_selection(widget, GPOINTER_TO_INT(data));
+}
+
+void bar_notify_selection(GtkWidget *bar, gint count)
+{
+ BarData *bd;
+ bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+ if (!bd) return;
+
+ gtk_container_foreach(GTK_CONTAINER(bd->vbox), bar_pane_notify_selection_cb, GINT_TO_POINTER(count));
+}
+
+gboolean bar_event(GtkWidget *bar, GdkEvent *event)
{
BarData *bd;
GList *list, *work;
- gint ret = FALSE;
+ gboolean ret = FALSE;
+
bd = g_object_get_data(G_OBJECT(bar), "bar_data");
if (!bd) return FALSE;
return ret;
}
-void bar_write_config(GtkWidget *bar, GString *outstr, gint indent)
+GtkWidget *bar_find_pane_by_id(GtkWidget *bar, PaneType type, const gchar *id)
{
BarData *bd;
GList *list, *work;
- if (!bar) return;
+ GtkWidget *ret = NULL;
+
+ if (!id || !id[0]) return NULL;
+
bd = g_object_get_data(G_OBJECT(bar), "bar_data");
- if (!bd) return;
-
- WRITE_STRING("<bar\n");
- indent++;
- write_bool_option(outstr, indent, "enabled", GTK_WIDGET_VISIBLE(bar));
- write_uint_option(outstr, indent, "width", bd->width);
- indent--;
- WRITE_STRING(">\n");
+ if (!bd) return NULL;
- list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
+ list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
+
work = list;
while (work)
{
- GtkWidget *expander = work->data;
- GtkWidget *widget = gtk_bin_get_child(GTK_BIN(expander));
+ GtkWidget *widget = gtk_bin_get_child(GTK_BIN(work->data));
PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
if (!pd) continue;
-
- pd->expanded = gtk_expander_get_expanded(GTK_EXPANDER(expander));
-
- if (pd->pane_write_config)
- pd->pane_write_config(widget, outstr, indent + 1);
-
+
+ if (type == pd->type && strcmp(id, pd->id) == 0)
+ {
+ ret = widget;
+ break;
+ }
work = work->next;
}
g_list_free(list);
-
- WRITE_STRING("</bar>\n");
+ return ret;
}
-
-void bar_pane_set_selection_func(GtkWidget *pane, GList *(*list_func)(gpointer data), gpointer data)
+void bar_clear(GtkWidget *bar)
{
- PaneData *pd;
-
- pd = g_object_get_data(G_OBJECT(pane), "pane_data");
- if (!pd) return;
+ BarData *bd;
+ GList *list, *work;
+
+ bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+ if (!bd) return;
- pd->list_func = list_func;
- pd->list_data = data;
+ list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
+
+ work = list;
+ while (work)
+ {
+ GtkWidget *widget = work->data;
+ gtk_widget_destroy(widget);
+ work = work->next;
+ }
+ g_list_free(list);
}
-void bar_set_selection_func(GtkWidget *bar, GList *(*list_func)(gpointer data), gpointer data)
+void bar_write_config(GtkWidget *bar, GString *outstr, gint indent)
{
BarData *bd;
GList *list, *work;
+
+ if (!bar) return;
+
bd = g_object_get_data(G_OBJECT(bar), "bar_data");
if (!bd) return;
- bd->list_func = list_func;
- bd->list_data = data;
+ WRITE_NL(); WRITE_STRING("<bar ");
+ write_bool_option(outstr, indent, "enabled", gtk_widget_get_visible(bar));
+ write_uint_option(outstr, indent, "width", bd->width);
+ WRITE_STRING(">");
+
+ indent++;
+ WRITE_NL(); WRITE_STRING("<clear/>");
list = gtk_container_get_children(GTK_CONTAINER(bd->vbox));
-
work = list;
while (work)
{
- GtkWidget *widget = gtk_bin_get_child(GTK_BIN(work->data));
-
- bar_pane_set_selection_func(widget, list_func, data);
-
+ GtkWidget *expander = work->data;
+ GtkWidget *widget = gtk_bin_get_child(GTK_BIN(expander));
+ PaneData *pd = g_object_get_data(G_OBJECT(widget), "pane_data");
+ if (!pd) continue;
+
+ pd->expanded = gtk_expander_get_expanded(GTK_EXPANDER(expander));
+
+ if (pd->pane_write_config)
+ pd->pane_write_config(widget, outstr, indent);
+
work = work->next;
}
g_list_free(list);
- return;
+ indent--;
+ WRITE_NL(); WRITE_STRING("</bar>");
}
+void bar_update_expander(GtkWidget *pane)
+{
+ PaneData *pd = g_object_get_data(G_OBJECT(pane), "pane_data");
+ GtkWidget *expander;
+
+ if (!pd) return;
-
-
+ expander = gtk_widget_get_parent(pane);
+
+ gtk_expander_set_expanded(GTK_EXPANDER(expander), pd->expanded);
+}
void bar_add(GtkWidget *bar, GtkWidget *pane)
{
GtkWidget *expander;
- GtkWidget *label;
BarData *bd = g_object_get_data(G_OBJECT(bar), "bar_data");
PaneData *pd = g_object_get_data(G_OBJECT(pane), "pane_data");
-
if (!bd) return;
- expander = gtk_expander_new(pd ? pd->title : "");
+ pd->lw = bd->lw;
+ pd->bar = bar;
+
+ expander = gtk_expander_new(NULL);
+ if (pd && pd->title)
+ {
+ gtk_expander_set_label_widget(GTK_EXPANDER(expander), pd->title);
+ gtk_widget_show(pd->title);
+ }
+
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_release_event", G_CALLBACK(bar_menu_cb), bd);
- label = gtk_expander_get_label_widget(GTK_EXPANDER(expander));
-// gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
- pref_label_bold(label, TRUE, FALSE);
-
gtk_container_add(GTK_CONTAINER(expander), pane);
gtk_expander_set_expanded(GTK_EXPANDER(expander), pd->expanded);
gtk_widget_show(expander);
- if (bd->list_func) bar_pane_set_selection_func(pane, bd->list_func, bd->list_data);
if (bd->fd && pd && pd->pane_set_fd) pd->pane_set_fd(pane, bd->fd);
}
-static void bar_populate_default(GtkWidget *bar)
+void bar_populate_default(GtkWidget *bar)
{
- GtkWidget *widget;
- widget = bar_pane_histogram_new(_("Histogram"), 80, TRUE);
- bar_add(bar, widget);
-
- widget = bar_pane_comment_new(_("Title"), "Xmp.dc.title", TRUE, 40);
- bar_add(bar, widget);
-
- widget = bar_pane_keywords_new(_("Keywords"), KEYWORD_KEY, TRUE);
- bar_add(bar, widget);
-
- widget = bar_pane_comment_new(_("Comment"), "Xmp.dc.description", TRUE, 150);
- bar_add(bar, widget);
-
- widget = bar_pane_exif_new(_("Exif"), TRUE);
- bar_add(bar, widget);
+ const gchar *populate_id[] = {"histogram", "title", "keywords", "comment", "exif", NULL};
+ const gchar **id = populate_id;
+
+ 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_sized(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
+static void bar_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer data)
{
BarData *bd = data;
+
bd->width = allocation->width;
}
-
-static void bar_width(BarData *bd, gint val)
-{
- gint size;
-
- size = bd->widget->allocation.width;
- size = CLAMP(size + val, BAR_SIZE_INCREMENT * 2, BAR_SIZE_INCREMENT * 16);
-
- gtk_widget_set_size_request(bd->widget, size, -1);
-}
-
-static void bar_larger(GtkWidget *widget, gpointer data)
+gint bar_get_width(GtkWidget *bar)
{
- BarData *bd = data;
-
- bar_width(bd, BAR_SIZE_INCREMENT);
-}
-
-static void bar_smaller(GtkWidget *widget, gpointer data)
-{
- BarData *bd = data;
+ BarData *bd;
+
+ bd = g_object_get_data(G_OBJECT(bar), "bar_data");
+ if (!bd) return 0;
- bar_width(bd, -BAR_SIZE_INCREMENT);
+ return bd->width;
}
void bar_close(GtkWidget *bar)
g_free(bd);
}
-GtkWidget *bar_new(GtkWidget *bounding_widget)
+#ifdef HAVE_LIBCHAMPLAIN_GTK
+/*
+ FIXME: this is an ugly hack that works around this bug:
+ https://bugzilla.gnome.org/show_bug.cgi?id=590692
+ http://bugzilla.openedhand.com/show_bug.cgi?id=1751
+ it should be removed as soon as a better solution exists
+*/
+
+static void bar_unrealize_clutter_fix_cb(GtkWidget *widget, gpointer data)
+{
+ GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget));
+ if (child) gtk_widget_unrealize(child);
+}
+#endif
+
+GtkWidget *bar_new(LayoutWindow *lw)
{
BarData *bd;
GtkWidget *box;
- GtkWidget *sizer;
- GtkWidget *label;
- GtkWidget *button;
- GtkWidget *arrow;
GtkWidget *scrolled;
bd = g_new0(BarData, 1);
+ bd->lw = lw;
+
bd->widget = gtk_vbox_new(FALSE, PREF_PAD_GAP);
g_object_set_data(G_OBJECT(bd->widget), "bar_data", bd);
g_signal_connect(G_OBJECT(bd->widget), "destroy",
G_CALLBACK(bar_destroy), bd);
- g_signal_connect(G_OBJECT(bd->widget), "size_allocate",
- G_CALLBACK(bar_sized), bd);
+ g_signal_connect(G_OBJECT(bd->widget), "size-allocate",
+ G_CALLBACK(bar_size_allocate), bd);
+
+ g_signal_connect(G_OBJECT(bd->widget), "button_release_event", G_CALLBACK(bar_menu_cb), bd);
- bd->width = PANEL_DEFAULT_WIDTH;
+ bd->width = SIDEBAR_DEFAULT_WIDTH;
gtk_widget_set_size_request(bd->widget, bd->width, -1);
box = gtk_hbox_new(FALSE, 0);
- sizer = sizer_new(bd->widget, bounding_widget, SIZER_POS_LEFT);
- sizer_set_limits(sizer, BAR_SIZE_INCREMENT * 2, -1, -1 , -1);
- gtk_box_pack_start(GTK_BOX(box), sizer, FALSE, FALSE, 0);
- gtk_widget_show(sizer);
-
- label = gtk_label_new(_("Filename:"));
- gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.0);
- gtk_box_pack_start(GTK_BOX(box), label, TRUE, TRUE, 0);
- gtk_widget_show(label);
-
bd->label_file_name = gtk_label_new("");
- pref_label_bold(bd->label_file_name, TRUE, FALSE);
- gtk_misc_set_alignment(GTK_MISC(bd->label_file_name), 0.0, 0.0);
+ gtk_label_set_ellipsize(GTK_LABEL(bd->label_file_name), PANGO_ELLIPSIZE_END);
+ gtk_label_set_selectable(GTK_LABEL(bd->label_file_name), TRUE);
+ gtk_misc_set_alignment(GTK_MISC(bd->label_file_name), 0.5, 0.5);
gtk_box_pack_start(GTK_BOX(box), bd->label_file_name, TRUE, TRUE, 0);
gtk_widget_show(bd->label_file_name);
- button = gtk_button_new();
- gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(bar_smaller), bd);
- gtk_box_pack_end(GTK_BOX(box), button, FALSE, FALSE, 0);
- arrow = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_NONE);
- gtk_widget_set_size_request(arrow, BAR_ARROW_SIZE, BAR_ARROW_SIZE);
- gtk_container_add(GTK_CONTAINER(button), arrow);
- gtk_widget_show(arrow);
- gtk_widget_show(button);
-
- button = gtk_button_new();
- gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
- g_signal_connect(G_OBJECT(button), "clicked",
- G_CALLBACK(bar_larger), bd);
- gtk_box_pack_end(GTK_BOX(box), button, FALSE, FALSE, 0);
- arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
- gtk_widget_set_size_request(arrow, BAR_ARROW_SIZE, BAR_ARROW_SIZE);
- gtk_container_add(GTK_CONTAINER(button), arrow);
- gtk_widget_show(arrow);
- gtk_widget_show(button);
-
gtk_box_pack_start(GTK_BOX(bd->widget), box, FALSE, FALSE, 0);
gtk_widget_show(box);
bd->vbox = gtk_vbox_new(FALSE, 0);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scrolled), bd->vbox);
gtk_viewport_set_shadow_type(GTK_VIEWPORT(gtk_bin_get_child(GTK_BIN(scrolled))), GTK_SHADOW_NONE);
-
+
+#ifdef HAVE_LIBCHAMPLAIN_GTK
+ g_signal_connect(G_OBJECT(gtk_bin_get_child(GTK_BIN(scrolled))), "unrealize", G_CALLBACK(bar_unrealize_clutter_fix_cb), NULL);
+#endif
+
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_NONE);
gtk_widget_show(bd->vbox);
return bd->widget;
}
-GtkWidget *bar_new_default(GtkWidget *bounding_widget)
-{
- GtkWidget *bar = bar_new(bounding_widget);
-
- bar_populate_default(bar);
-
- gtk_widget_show(bar);
-
- return bar;
-}
-GtkWidget *bar_new_from_config(GtkWidget *bounding_widget, const gchar **attribute_names, const gchar **attribute_values)
+GtkWidget *bar_update_from_config(GtkWidget *bar, const gchar **attribute_names, const gchar **attribute_values)
{
- GtkWidget *bar = bar_new(bounding_widget);
-
gboolean enabled = TRUE;
- gint width = PANEL_DEFAULT_WIDTH;
+ gint width = SIDEBAR_DEFAULT_WIDTH;
while (*attribute_names)
{
if (READ_INT_FULL("width", width)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
gtk_widget_set_size_request(bar, width, -1);
- if (enabled) gtk_widget_show(bar);
+ if (enabled)
+ {
+ gtk_widget_show(bar);
+ }
+ else
+ {
+ gtk_widget_hide(bar);
+ }
return bar;
}
+GtkWidget *bar_new_from_config(LayoutWindow *lw, const gchar **attribute_names, const gchar **attribute_values)
+{
+ GtkWidget *bar = bar_new(lw);
+ return bar_update_from_config(bar, attribute_names, attribute_values);
+}
+GtkWidget *bar_pane_expander_title(const gchar *title)
+{
+ GtkWidget *widget = gtk_label_new(title);
+
+ pref_label_bold(widget, TRUE, FALSE);
+ //gtk_label_set_ellipsize(GTK_LABEL(widget), PANGO_ELLIPSIZE_END); //FIXME: do not work
+
+ return widget;
+}
+
+gboolean bar_pane_translate_title(PaneType type, const gchar *id, gchar **title)
+{
+ const KnownPanes *pane = known_panes;
+
+ if (!title) return FALSE;
+ while (pane->id)
+ {
+ if (pane->type == type && strcmp(pane->id, id) == 0) break;
+ pane++;
+ }
+ if (!pane->id) return FALSE;
+
+ if (*title && **title && strcmp(pane->title, *title) != 0) return FALSE;
+
+ g_free(*title);
+ *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: */
projects / geeqie.git / blobdiff