/*
* Geeqie
* (C) 2004 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
*
* Author: John Ellis
*
#include "ui_menu.h"
#include "ui_misc.h"
#include "rcfile.h"
+#include "layout.h"
static void bar_pane_comment_changed(GtkTextBuffer *buffer, gpointer data);
static void bar_pane_comment_update(PaneCommentData *pcd)
{
gchar *comment = NULL;
+ gchar *orig_comment = NULL;
+ gchar *comment_not_null;
GtkTextBuffer *comment_buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(pcd->comment_view));
- g_signal_handlers_block_by_func(comment_buffer, bar_pane_comment_changed, pcd);
-
+ orig_comment = text_widget_text_pull(pcd->comment_view);
comment = metadata_read_string(pcd->fd, pcd->key, METADATA_PLAIN);
- gtk_text_buffer_set_text(comment_buffer,
- (comment) ? comment : "", -1);
- g_free(comment);
+ comment_not_null = (comment) ? comment : "";
- g_signal_handlers_unblock_by_func(comment_buffer, bar_pane_comment_changed, pcd);
+ if (strcmp(orig_comment, comment_not_null) != 0)
+ {
+ g_signal_handlers_block_by_func(comment_buffer, bar_pane_comment_changed, pcd);
+ gtk_text_buffer_set_text(comment_buffer, comment_not_null, -1);
+ g_signal_handlers_unblock_by_func(comment_buffer, bar_pane_comment_changed, pcd);
+ }
+ g_free(comment);
+ g_free(orig_comment);
gtk_widget_set_sensitive(pcd->comment_view, (pcd->fd != NULL));
}
GList *work;
gchar *comment = NULL;
- if (!pcd->pane.list_func) return;
-
comment = text_widget_text_pull(pcd->comment_view);
- list = pcd->pane.list_func(pcd->pane.list_data);
+ list = layout_selection_list(pcd->pane.lw);
+ list = file_data_process_groups_in_selection(list, FALSE, NULL);
+
work = list;
while (work)
{
FileData *fd = work->data;
work = work->next;
+ if (fd == pcd->fd) continue;
if (append)
{
pcd = g_object_get_data(G_OBJECT(bar), "pane_data");
if (!pcd) return FALSE;
- if (GTK_WIDGET_HAS_FOCUS(pcd->comment_view)) return gtk_widget_event(pcd->comment_view, event);
+ if (gtk_widget_has_focus(pcd->comment_view)) return gtk_widget_event(pcd->comment_view, event);
return FALSE;
}
pcd = g_object_get_data(G_OBJECT(pane), "pane_data");
if (!pcd) return;
- WRITE_STRING("<pane_comment\n");
- indent++;
- write_char_option(outstr, indent, "pane.title", gtk_label_get_text(GTK_LABEL(pcd->pane.title)));
- WRITE_BOOL(*pcd, pane.expanded);
+ WRITE_NL(); WRITE_STRING("<pane_comment ");
+ write_char_option(outstr, indent, "id", pcd->pane.id);
+ write_char_option(outstr, indent, "title", gtk_label_get_text(GTK_LABEL(pcd->pane.title)));
+ WRITE_BOOL(pcd->pane, expanded);
WRITE_CHAR(*pcd, key);
- WRITE_INT(*pcd, height);
- indent--;
- WRITE_STRING("/>\n");
+ WRITE_INT(*pcd, height);
+ WRITE_STRING("/>");
}
static void bar_pane_comment_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
PaneCommentData *pcd = data;
- if (fd == pcd->fd) bar_pane_comment_update(pcd);
+ if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pcd->fd)
+ {
+ DEBUG_1("Notify pane_comment: %s %04x", fd->path, type);
+
+ bar_pane_comment_update(pcd);
+ }
}
static void bar_pane_comment_changed(GtkTextBuffer *buffer, gpointer data)
{
PaneCommentData *pcd = data;
- file_data_unregister_notify_func(bar_pane_comment_notify_cb, pcd);
bar_pane_comment_write(pcd);
- file_data_register_notify_func(bar_pane_comment_notify_cb, pcd, NOTIFY_PRIORITY_LOW);
}
menu_item_add_stock(GTK_WIDGET(menu), _("Replace existing text in selected files"), GTK_STOCK_CONVERT, G_CALLBACK(bar_pane_comment_sel_replace_cb), data);
}
-
-static void bar_pane_comment_close(GtkWidget *bar)
-{
- PaneCommentData *pcd;
-
- pcd = g_object_get_data(G_OBJECT(bar), "pane_data");
- if (!pcd) return;
-
- gtk_widget_destroy(pcd->comment_view);
-}
-
static void bar_pane_comment_destroy(GtkWidget *widget, gpointer data)
{
PaneCommentData *pcd = data;
file_data_unref(pcd->fd);
g_free(pcd->key);
-
+
+ g_free(pcd->pane.id);
g_free(pcd);
}
-GtkWidget *bar_pane_comment_new(const gchar *title, const gchar *key, gboolean expanded, gint height)
+static GtkWidget *bar_pane_comment_new(const gchar *id, const gchar *title, const gchar *key, gboolean expanded, gint height)
{
PaneCommentData *pcd;
GtkWidget *scrolled;
pcd->pane.pane_set_fd = bar_pane_comment_set_fd;
pcd->pane.pane_event = bar_pane_comment_event;
pcd->pane.pane_write_config = bar_pane_comment_write_config;
- pcd->pane.title = gtk_label_new(title);
+ pcd->pane.title = bar_pane_expander_title(title);
+ pcd->pane.id = g_strdup(id);
+ pcd->pane.type = PANE_COMMENT;
+
pcd->pane.expanded = expanded;
pcd->key = g_strdup(key);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_widget_set_size_request(scrolled, -1, height);
+ gtk_widget_set_size_request(pcd->widget, -1, height);
gtk_widget_show(scrolled);
pcd->comment_view = gtk_text_view_new();
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(pcd->comment_view), GTK_WRAP_WORD);
gtk_container_add(GTK_CONTAINER(scrolled), pcd->comment_view);
g_signal_connect(G_OBJECT(pcd->comment_view), "populate-popup",
G_CALLBACK(bar_pane_comment_populate_popup), pcd);
GtkWidget *bar_pane_comment_new_from_config(const gchar **attribute_names, const gchar **attribute_values)
{
- gchar *title = g_strdup(_("NoName"));
+ gchar *title = NULL;
gchar *key = g_strdup(COMMENT_KEY);
gboolean expanded = TRUE;
gint height = 50;
+ gchar *id = g_strdup("comment");
+ GtkWidget *ret;
while (*attribute_names)
{
const gchar *option = *attribute_names++;
const gchar *value = *attribute_values++;
- if (READ_CHAR_FULL("pane.title", title)) continue;
+ if (READ_CHAR_FULL("title", title)) continue;
if (READ_CHAR_FULL("key", key)) continue;
- if (READ_BOOL_FULL("pane.expanded", expanded)) continue;
+ if (READ_BOOL_FULL("expanded", expanded)) continue;
if (READ_INT_FULL("height", height)) continue;
+ if (READ_CHAR_FULL("id", id)) continue;
- DEBUG_1("unknown attribute %s = %s", option, value);
+ log_printf("unknown attribute %s = %s\n", option, value);
}
- return bar_pane_comment_new(title, key, expanded, height);
+ bar_pane_translate_title(PANE_COMMENT, id, &title);
+ ret = bar_pane_comment_new(id, title, key, expanded, height);
+ g_free(title);
+ g_free(key);
+ g_free(id);
+ return ret;
+}
+
+void bar_pane_comment_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values)
+{
+ PaneCommentData *pcd;
+
+ pcd = g_object_get_data(G_OBJECT(pane), "pane_data");
+ if (!pcd) return;
+
+ gchar *title = NULL;
+
+ while (*attribute_names)
+ {
+ const gchar *option = *attribute_names++;
+ const gchar *value = *attribute_values++;
+
+ if (READ_CHAR_FULL("title", title)) continue;
+ if (READ_CHAR_FULL("key", pcd->key)) continue;
+ if (READ_BOOL_FULL("expanded", pcd->pane.expanded)) continue;
+ if (READ_INT_FULL("height", pcd->height)) continue;
+ if (READ_CHAR_FULL("id", pcd->pane.id)) continue;
+
+
+ log_printf("unknown attribute %s = %s\n", option, value);
+ }
+
+ if (title)
+ {
+ bar_pane_translate_title(PANE_COMMENT, pcd->pane.id, &title);
+ gtk_label_set_text(GTK_LABEL(pcd->pane.title), title);
+ g_free(title);
+ }
+ gtk_widget_set_size_request(pcd->widget, -1, pcd->height);
+ bar_update_expander(pane);
+ bar_pane_comment_update(pcd);
}
/* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */
projects / geeqie.git / blobdiff