* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include <glib/gprintf.h>
-
#include "main.h"
#include "bar-keywords.h"
#include "filedata.h"
-#include "history-list.h"
#include "metadata.h"
-#include "misc.h"
#include "ui-fileops.h"
#include "ui-misc.h"
#include "ui-utildlg.h"
-#include "utilops.h"
#include "bar.h"
#include "ui-menu.h"
#include "rcfile.h"
while (list)
{
- const gchar *word = list->data;
+ const gchar *word = static_cast<const gchar *>(list->data);
GtkTextIter iter;
gtk_text_buffer_get_end_iter(buffer, &iter);
gboolean bar_keyword_tree_expand_if_set_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
gboolean set;
gtk_tree_model_get(model, iter, FILTER_KEYWORD_COLUMN_TOGGLE, &set, -1);
gboolean bar_keyword_tree_collapse_if_unset_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
gboolean set;
gtk_tree_model_get(model, iter, FILTER_KEYWORD_COLUMN_TOGGLE, &set, -1);
while (work1 && work2)
{
- if (strcmp(work1->data, work2->data) != 0) break;
+ if (strcmp(static_cast<const gchar *>(work1->data), static_cast<const gchar *>(work2->data)) != 0) break;
work1 = work1->next;
work2 = work2->next;
}
{
PaneKeywordsData *pkd;
- pkd = g_object_get_data(G_OBJECT(pane), "pane_data");
+ pkd = static_cast<PaneKeywordsData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
if (!pkd) return;
file_data_unref(pkd->fd);
void bar_keyword_tree_get_expanded_cb(GtkTreeView *keyword_treeview, GtkTreePath *path, gpointer data)
{
- GList **expanded = data;
+ GList **expanded = static_cast<GList **>(data);
GtkTreeModel *model;
GtkTreeIter iter;
gchar *path_string;
GList *path_expanded = NULL;
gint w, h;
- pkd = g_object_get_data(G_OBJECT(pane), "pane_data");
+ pkd = static_cast<PaneKeywordsData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
if (!pkd) return;
gtk_widget_get_size_request(GTK_WIDGET(pane), &w, &h);
g_list_first(path_expanded);
while (path_expanded)
{
- bar_pane_keywords_entry_write_config(path_expanded->data, outstr, indent);
+ bar_pane_keywords_entry_write_config(static_cast<gchar *>(path_expanded->data), outstr, indent);
g_free(path_expanded->data);
path_expanded = path_expanded->next;
}
{
PaneKeywordsData *pkd;
- pkd = g_object_get_data(G_OBJECT(bar), "pane_data");
+ pkd = static_cast<PaneKeywordsData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
if (!pkd) return FALSE;
if (gtk_widget_has_focus(pkd->keyword_view)) return gtk_widget_event(pkd->keyword_view, event);
static void bar_pane_keywords_keyword_toggle(GtkCellRendererToggle *UNUSED(toggle), const gchar *path, gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeModel *model;
GtkTreeIter iter;
GtkTreePath *tpath;
void bar_pane_keywords_filter_modify(GtkTreeModel *model, GtkTreeIter *iter, GValue *value, gint column, gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeModel *keyword_tree = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(model));
GtkTreeIter child_iter;
gboolean bar_pane_keywords_filter_visible(GtkTreeModel *keyword_tree, GtkTreeIter *iter, gpointer data)
{
- GtkTreeModel *filter = data;
+ GtkTreeModel *filter = static_cast<GtkTreeModel *>(data);
return !keyword_is_hidden_in(keyword_tree, iter, filter);
}
work = list;
while (work)
{
- FileData *fd = work->data;
+ FileData *fd = static_cast<FileData *>(work->data);
work = work->next;
if (append)
static void bar_pane_keywords_sel_add_cb(GtkWidget *UNUSED(button), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
bar_pane_keywords_set_selection(pkd, TRUE);
}
static void bar_pane_keywords_sel_replace_cb(GtkWidget *UNUSED(button), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
bar_pane_keywords_set_selection(pkd, FALSE);
}
static void bar_pane_keywords_populate_popup_cb(GtkTextView *UNUSED(textview), GtkMenu *menu, gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
menu_item_add_divider(GTK_WIDGET(menu));
menu_item_add_stock(GTK_WIDGET(menu), _("Add selected keywords to selected files"), GTK_STOCK_ADD, G_CALLBACK(bar_pane_keywords_sel_add_cb), pkd);
static void bar_pane_keywords_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == pkd->fd)
{
DEBUG_1("Notify pane_keywords: %s %04x", fd->path, type);
static gboolean bar_pane_keywords_changed_idle_cb(gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
bar_pane_keywords_write(pkd);
bar_keyword_tree_sync(pkd);
pkd->idle_id = 0;
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static void bar_pane_keywords_changed(GtkTextBuffer *UNUSED(buffer), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
if (pkd->idle_id) return;
/* higher prio than redraw */
static GtkTargetEntry bar_pane_keywords_drag_types[] = {
- { TARGET_APP_KEYWORD_PATH_STRING, GTK_TARGET_SAME_WIDGET, TARGET_APP_KEYWORD_PATH },
- { "text/plain", 0, TARGET_TEXT_PLAIN }
+ { const_cast<gchar *>(TARGET_APP_KEYWORD_PATH_STRING), GTK_TARGET_SAME_WIDGET, TARGET_APP_KEYWORD_PATH },
+ { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
};
static gint n_keywords_drag_types = 2;
static GtkTargetEntry bar_pane_keywords_drop_types[] = {
- { TARGET_APP_KEYWORD_PATH_STRING, GTK_TARGET_SAME_WIDGET, TARGET_APP_KEYWORD_PATH },
- { "text/plain", 0, TARGET_TEXT_PLAIN }
+ { const_cast<gchar *>(TARGET_APP_KEYWORD_PATH_STRING), GTK_TARGET_SAME_WIDGET, TARGET_APP_KEYWORD_PATH },
+ { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
};
static gint n_keywords_drop_types = 2;
{
GList *path = keyword_tree_get_path(keyword_tree, &child_iter);
gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
- 8, (gpointer) &path, sizeof(path));
+ 8, reinterpret_cast<const guchar *>(&path), sizeof(path));
break;
}
GList *work = *keywords;
while (work)
{
- gchar *keyword = work->data;
+ gchar *keyword = static_cast<gchar *>(work->data);
if (keyword_exists(keyword_tree, NULL, dest_kw_iter, keyword, FALSE, NULL))
{
GList *next = work->next;
GtkSelectionData *selection_data, guint info,
guint UNUSED(time), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreePath *tpath = NULL;
GtkTreeViewDropPosition pos;
GtkTreeModel *model;
{
case TARGET_APP_KEYWORD_PATH:
{
- GList *path = *(gpointer *)gtk_selection_data_get_data(selection_data);
+ GList *path = static_cast<GList *>(*(gpointer *)(gtk_selection_data_get_data(selection_data)));
src_valid = keyword_tree_get_iter(keyword_tree, &src_kw_iter, path);
string_list_free(path);
break;
work = new_keywords;
while (work)
{
- gchar *keyword = work->data;
+ gchar *keyword = static_cast<gchar *>(work->data);
keyword_set(GTK_TREE_STORE(keyword_tree), &new_kw_iter, keyword, TRUE);
work = work->next;
static void bar_pane_keywords_edit_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- ConfDialogData *cdd = data;
+ ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
gtk_tree_path_free(cdd->click_tpath);
g_free(cdd);
}
static void bar_pane_keywords_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
{
- ConfDialogData *cdd = data;
+ ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
PaneKeywordsData *pkd = cdd->pkd;
GtkTreeModel *model;
if (cdd->edit_existing)
{
if (keywords && keywords->data && /* there should be one keyword */
- !keyword_exists(keyword_tree, NULL, &kw_iter, keywords->data, TRUE, NULL))
+ !keyword_exists(keyword_tree, NULL, &kw_iter, static_cast<const gchar *>(keywords->data), TRUE, NULL))
{
- keyword_set(GTK_TREE_STORE(keyword_tree), &kw_iter, keywords->data, cdd->is_keyword);
+ keyword_set(GTK_TREE_STORE(keyword_tree), &kw_iter, static_cast<const gchar *>(keywords->data), cdd->is_keyword);
}
}
else
while (work)
{
GtkTreeIter add;
- if (keyword_exists(keyword_tree, NULL, (have_dest || append_to) ? &kw_iter : NULL, work->data, FALSE, NULL))
+ if (keyword_exists(keyword_tree, NULL, (have_dest || append_to) ? &kw_iter : NULL, static_cast<const gchar *>(work->data), FALSE, NULL))
{
work = work->next;
continue;
append_to = TRUE;
kw_iter = add;
}
- keyword_set(GTK_TREE_STORE(keyword_tree), &add, work->data, cdd->is_keyword);
+ keyword_set(GTK_TREE_STORE(keyword_tree), &add, static_cast<const gchar *>(work->data), cdd->is_keyword);
work = work->next;
}
}
static void bar_pane_keywords_conf_set_helper(GtkWidget *UNUSED(widget), gpointer data)
{
- ConfDialogData *cdd = data;
+ ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
cdd->is_keyword = FALSE;
}
static void bar_pane_keywords_conf_set_kw(GtkWidget *UNUSED(widget), gpointer data)
{
- ConfDialogData *cdd = data;
+ ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
cdd->is_keyword = TRUE;
}
static void bar_pane_keywords_edit_dialog_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
bar_pane_keywords_edit_dialog(pkd, TRUE);
}
static void bar_pane_keywords_add_dialog_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
bar_pane_keywords_edit_dialog(pkd, FALSE);
}
static void bar_pane_keywords_connect_mark_cb(GtkWidget *menu_widget, gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeModel *model;
GtkTreeIter iter;
static void bar_pane_keywords_disconnect_marks_cb(GtkWidget *menu_widget, gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GenericDialog *gd;
GString *message = g_string_new("");
static void bar_pane_keywords_delete_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeModel *model;
GtkTreeIter iter;
static void bar_pane_keywords_hide_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeModel *model;
GtkTreeIter iter;
static void bar_pane_keywords_show_all_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeModel *model;
GtkTreeModel *keyword_tree;
static void bar_pane_keywords_revert_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GList *work;
GtkTreePath *tree_path;
gchar *path;
work = pkd->expanded_rows;
while (work)
{
- path = work->data;
+ path = static_cast<gchar *>(work->data);
tree_path = gtk_tree_path_new_from_string(path);
gtk_tree_view_expand_to_path(GTK_TREE_VIEW(pkd->keyword_treeview), tree_path);
work = work->next;
static void bar_pane_keywords_expand_checked_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeModel *model;
model = gtk_tree_view_get_model(GTK_TREE_VIEW(pkd->keyword_treeview));
static void bar_pane_keywords_collapse_all_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
string_list_free(pkd->expanded_rows);
pkd->expanded_rows = NULL;
static void bar_pane_keywords_revert_hidden_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeModel *model;
GtkTreeModel *keyword_tree;
static void bar_pane_keywords_collapse_unchecked_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeModel *model;
model = gtk_tree_view_get_model(GTK_TREE_VIEW(pkd->keyword_treeview));
static void bar_pane_keywords_hide_unchecked_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeModel *model;
GtkTreeModel *keyword_tree;
static void bar_pane_keywords_expand_checked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
pkd->expand_checked = !pkd->expand_checked;
bar_keyword_tree_sync(pkd);
}
static void bar_pane_keywords_collapse_unchecked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
pkd->collapse_unchecked = !pkd->collapse_unchecked;
bar_keyword_tree_sync(pkd);
}
static void bar_pane_keywords_hide_unchecked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
pkd->hide_unchecked = !pkd->hide_unchecked;
bar_keyword_tree_sync(pkd);
}
*/
static void bar_pane_keywords_add_to_selected_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
GtkTreeIter iter; /* This is the iter which initial holds the current keyword */
GtkTreeIter child_iter;
GtkTreeModel *model;
work = list;
while (work)
{
- FileData *fd = work->data;
+ FileData *fd = static_cast<FileData *>(work->data);
work = work->next;
metadata_append_list(fd, KEYWORD_KEY, keywords);
}
static gboolean bar_pane_keywords_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
bar_pane_keywords_menu_popup(widget, pkd, bevent->x, bevent->y);
*-------------------------------------------------------------------
*/
-void bar_pane_keywords_close(GtkWidget *bar)
-{
- PaneKeywordsData *pkd;
+//void bar_pane_keywords_close(GtkWidget *bar)
+//{
+ //PaneKeywordsData *pkd;
- pkd = g_object_get_data(G_OBJECT(bar), "pane_data");
- if (!pkd) return;
+ //pkd = g_object_get_data(G_OBJECT(bar), "pane_data");
+ //if (!pkd) return;
- g_free(pkd->pane.id);
- gtk_widget_destroy(pkd->widget);
-}
+ //g_free(pkd->pane.id);
+ //gtk_widget_destroy(pkd->widget);
+//}
static void bar_pane_keywords_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
gchar *path;
path = g_build_filename(get_rc_dir(), "keywords", NULL);
gtk_tree_view_set_expander_column(GTK_TREE_VIEW(pkd->keyword_treeview), column);
gtk_drag_source_set(pkd->keyword_treeview,
- GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+ static_cast<GdkModifierType>(GDK_BUTTON1_MASK | GDK_BUTTON2_MASK),
bar_pane_keywords_drag_types, n_keywords_drag_types,
- GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+ static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK));
g_signal_connect(G_OBJECT(pkd->keyword_treeview), "drag_data_get",
G_CALLBACK(bar_pane_keywords_dnd_get), pkd);
G_CALLBACK(bar_pane_keywords_dnd_end), pkd);
gtk_drag_dest_set(pkd->keyword_treeview,
- GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
+ static_cast<GtkDestDefaults>(GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP),
bar_pane_keywords_drop_types, n_keywords_drop_types,
- GDK_ACTION_COPY | GDK_ACTION_MOVE);
+ static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE));
g_signal_connect(G_OBJECT(pkd->keyword_treeview), "drag_data_received",
G_CALLBACK(bar_pane_keywords_dnd_receive), pkd);
{
PaneKeywordsData *pkd;
- pkd = g_object_get_data(G_OBJECT(pane), "pane_data");
+ pkd = static_cast<PaneKeywordsData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
if (!pkd) return;
gchar *title = NULL;
gchar *path = NULL;
GtkTreePath *tree_path;
- pkd = g_object_get_data(G_OBJECT(pane), "pane_data");
+ pkd = static_cast<PaneKeywordsData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
if (!pkd) return;
while (*attribute_names)
static gboolean autocomplete_activate_cb(GtkWidget *UNUSED(widget), gpointer data)
{
- PaneKeywordsData *pkd = data;
+ PaneKeywordsData *pkd = static_cast<PaneKeywordsData *>(data);
gchar *entry_text;
GtkTextBuffer *buffer;
GtkTextIter iter;
GtkTreeIter iter;
gboolean valid;
- valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(keyword_store), &iter);
-
- while (valid)
+ if (keyword_store)
{
- gtk_tree_model_get (GTK_TREE_MODEL(keyword_store), &iter, 0, &string, -1);
- string_nl = g_strconcat(string, "\n", NULL);
- ret_list = g_list_append(ret_list, string);
- valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(keyword_store), &iter);
+ valid = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(keyword_store), &iter);
- g_free(string_nl);
+ while (valid)
+ {
+ gtk_tree_model_get (GTK_TREE_MODEL(keyword_store), &iter, 0, &string, -1);
+ string_nl = g_strconcat(string, "\n", NULL);
+ ret_list = g_list_append(ret_list, string);
+ valid = gtk_tree_model_iter_next(GTK_TREE_MODEL(keyword_store), &iter);
+
+ g_free(string_nl);
+ }
}
return ret_list;
if (!keyword_list) return;
- gtk_list_store_clear(keyword_store);
+ if (keyword_store)
+ {
+ gtk_list_store_clear(keyword_store);
+ }
+ else
+ {
+ keyword_store = gtk_list_store_new(1, G_TYPE_STRING);
+ }
while (keyword_list)
{
}
else
{
- gtk_widget_grab_focus(children->data);
+ gtk_widget_grab_focus(GTK_WIDGET(children->data));
ret = FALSE;
}
projects / geeqie.git / blobdiff