* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
#include "bar-exif.h"
+#include <config.h>
+
+#include "bar.h"
+#include "compat.h"
+#include "debug.h"
+#include "dnd.h"
#include "exif.h"
-#include "metadata.h"
#include "filedata.h"
-#include "ui-misc.h"
-#include "ui-menu.h"
-#include "bar.h"
+#include "intl.h"
+#include "layout.h"
+#include "main-defines.h"
+#include "metadata.h"
+#include "misc.h"
#include "rcfile.h"
-#include "dnd.h"
+#include "ui-menu.h"
+#include "ui-misc.h"
#include "ui-utildlg.h"
-#include "layout.h"
-#define MIN_HEIGHT 25
+enum {
+ MIN_HEIGHT = 25
+};
/*
*-------------------------------------------------------------------
* EXIF widget
*-------------------------------------------------------------------
*/
-typedef struct _ExifEntry ExifEntry;
-typedef struct _PaneExifData PaneExifData;
+struct PaneExifData;
-struct _ExifEntry
+struct ExifEntry
{
GtkWidget *ebox;
GtkWidget *box;
};
-struct _PaneExifData
+struct PaneExifData
{
PaneData pane;
GtkWidget *vbox;
FileData *fd;
};
-typedef struct _ConfDialogData ConfDialogData;
-struct _ConfDialogData
+struct ConfDialogData
{
GtkWidget *widget; /* pane or entry, devidet by presenceof "pane_data" or "entry_data" */
static void bar_pane_exif_notify_cb(FileData *fd, NotifyType type, gpointer data);
static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);
-static void bar_pane_exif_entry_changed(GtkEntry *UNUSED(text_entry), gpointer data)
+static void bar_pane_exif_entry_changed(GtkEntry *, gpointer data)
{
- ExifEntry *ee = static_cast<ExifEntry *>(data);
+ auto ee = static_cast<ExifEntry *>(data);
gchar *text;
if (!ee->ped->fd) return;
g_free(text);
}
-static void bar_pane_exif_entry_destroy(GtkWidget *UNUSED(widget), gpointer data)
+static void bar_pane_exif_entry_destroy(GtkWidget *, gpointer data)
{
- ExifEntry *ee = static_cast<ExifEntry *>(data);
+ auto ee = static_cast<ExifEntry *>(data);
g_free(ee->key);
g_free(ee->title);
gboolean horizontal = !ee->editable;
gboolean editable = ee->editable;
- if (ee->box) gtk_widget_destroy(ee->box);
+ if (ee->box) g_object_unref(ee->box);
ee->box = horizontal ? gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0) : gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
- gtk_container_add(GTK_CONTAINER(ee->ebox), ee->box);
+ gq_gtk_container_add(GTK_WIDGET(ee->ebox), ee->box);
gtk_widget_show(ee->box);
- ee->title_label = gtk_label_new(NULL);
+ ee->title_label = gtk_label_new(nullptr);
gtk_label_set_xalign(GTK_LABEL(ee->title_label), horizontal ? 1.0 : 0.0);
gtk_label_set_yalign(GTK_LABEL(ee->title_label), 0.5);
gtk_size_group_add_widget(ped->size_group, ee->title_label);
- gtk_box_pack_start(GTK_BOX(ee->box), ee->title_label, FALSE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(ee->box), ee->title_label, FALSE, TRUE, 0);
gtk_widget_show(ee->title_label);
if (editable)
}
else
{
- ee->value_widget = gtk_label_new(NULL);
-// gtk_label_set_width_chars(GTK_LABEL(ee->value_widget), 20);
+ ee->value_widget = gtk_label_new(nullptr);
gtk_label_set_ellipsize(GTK_LABEL(ee->value_widget), PANGO_ELLIPSIZE_END);
-// gtk_widget_set_size_request(ee->value_widget, 100, -1);
gtk_label_set_xalign(GTK_LABEL(ee->value_widget), 0.0);
gtk_label_set_yalign(GTK_LABEL(ee->value_widget), 0.5);
}
- gtk_box_pack_start(GTK_BOX(ee->box), ee->value_widget, TRUE, TRUE, 1);
+ gq_gtk_box_pack_start(GTK_BOX(ee->box), ee->value_widget, TRUE, TRUE, 1);
gtk_widget_show(ee->value_widget);
}
static GtkWidget *bar_pane_exif_add_entry(PaneExifData *ped, const gchar *key, const gchar *title, gboolean if_set, gboolean editable)
{
- ExifEntry *ee = g_new0(ExifEntry, 1);
+ auto ee = g_new0(ExifEntry, 1);
ee->key = g_strdup(key);
if (title && title[0])
g_signal_connect_after(G_OBJECT(ee->ebox), "destroy",
G_CALLBACK(bar_pane_exif_entry_destroy), ee);
- gtk_box_pack_start(GTK_BOX(ped->vbox), ee->ebox, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(ped->vbox), ee->ebox, FALSE, FALSE, 0);
bar_pane_exif_entry_dnd_init(ee->ebox);
g_signal_connect(ee->ebox, "button_release_event", G_CALLBACK(bar_pane_exif_menu_cb), ped);
static void bar_pane_exif_reparent_entry(GtkWidget *entry, GtkWidget *pane)
{
-
PaneExifData *ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
+
auto ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
PaneExifData *old_ped;
- ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
+ auto ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
if (!ped || !ee) return;
ee->ped = ped;
gtk_size_group_add_widget(ped->size_group, ee->title_label);
- gtk_box_pack_start(GTK_BOX(ped->vbox), entry, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(ped->vbox), entry, FALSE, FALSE, 0);
}
static void bar_pane_exif_entry_update_title(ExifEntry *ee)
static void bar_pane_exif_update_entry(PaneExifData *ped, GtkWidget *entry, gboolean update_title)
{
gchar *text;
- ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
+ auto ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
gshort rating;
if (!ee) return;
if (!ped->show_all && ee->if_set && !ee->editable && (!text || !*text))
{
- gtk_label_set_text(GTK_LABEL(ee->value_widget), NULL);
+ gtk_label_set_text(GTK_LABEL(ee->value_widget), nullptr);
gtk_widget_hide(entry);
}
else
if (ee->editable)
{
g_signal_handlers_block_by_func(ee->value_widget, (gpointer *)bar_pane_exif_entry_changed, ee);
- gtk_entry_set_text(GTK_ENTRY(ee->value_widget), text ? text : "");
+ gq_gtk_entry_set_text(GTK_ENTRY(ee->value_widget), text ? text : "");
g_signal_handlers_unblock_by_func(ee->value_widget, (gpointer)bar_pane_exif_entry_changed, ee);
- gtk_widget_set_tooltip_text(ee->box, NULL);
+ gtk_widget_set_tooltip_text(ee->box, nullptr);
}
else
{
static void bar_pane_exif_update(PaneExifData *ped)
{
- GList *list, *work;
+ GList *list;
+ GList *work;
ped->all_hidden = TRUE;
work = list;
while (work)
{
- GtkWidget *entry = static_cast<GtkWidget *>(work->data);
+ auto entry = static_cast<GtkWidget *>(work->data);
work = work->next;
bar_pane_exif_update_entry(ped, entry, FALSE);
gtk_widget_set_sensitive(ped->pane.title, !ped->all_hidden);
}
-void bar_pane_exif_set_fd(GtkWidget *widget, FileData *fd)
+static void bar_pane_exif_set_fd(GtkWidget *widget, FileData *fd)
{
PaneExifData *ped;
bar_pane_exif_update(ped);
}
-gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
+static gint bar_pane_exif_event(GtkWidget *bar, GdkEvent *event)
{
PaneExifData *ped;
gboolean ret = FALSE;
- GList *list, *work;
+ GList *list;
+ GList *work;
ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
if (!ped) return FALSE;
work = list;
while (!ret && work)
{
- GtkWidget *entry = static_cast<GtkWidget *>(work->data);
- ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
+ auto entry = static_cast<GtkWidget *>(work->data);
+ auto ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
work = work->next;
if (ee->editable && gtk_widget_has_focus(ee->value_widget)) ret = gtk_widget_event(ee->value_widget, event);
static void bar_pane_exif_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
-
PaneExifData *ped = static_cast<PaneExifData *>(data);
+
auto ped = static_cast<PaneExifData *>(data);
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) && fd == ped->fd)
{
DEBUG_1("Notify pane_exif: %s %04x", fd->path, type);
*/
static GtkTargetEntry bar_pane_exif_drag_types[] = {
- { TARGET_APP_EXIF_ENTRY_STRING, GTK_TARGET_SAME_APP, TARGET_APP_EXIF_ENTRY },
- { "text/plain", 0, TARGET_TEXT_PLAIN }
+ { const_cast<gchar *>(TARGET_APP_EXIF_ENTRY_STRING), GTK_TARGET_SAME_APP, TARGET_APP_EXIF_ENTRY },
+ { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
};
static gint n_exif_entry_drag_types = 2;
static GtkTargetEntry bar_pane_exif_drop_types[] = {
- { TARGET_APP_EXIF_ENTRY_STRING, GTK_TARGET_SAME_APP, TARGET_APP_EXIF_ENTRY },
- { "text/plain", 0, TARGET_TEXT_PLAIN }
+ { const_cast<gchar *>(TARGET_APP_EXIF_ENTRY_STRING), GTK_TARGET_SAME_APP, TARGET_APP_EXIF_ENTRY },
+ { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
};
static gint n_exif_entry_drop_types = 2;
-static void bar_pane_exif_entry_dnd_get(GtkWidget *entry, GdkDragContext *UNUSED(context),
+static void bar_pane_exif_entry_dnd_get(GtkWidget *entry, GdkDragContext *,
GtkSelectionData *selection_data, guint info,
- guint UNUSED(time), gpointer UNUSED(data))
+ guint, gpointer)
{
- ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
+ auto ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
switch (info)
{
case TARGET_APP_EXIF_ENTRY:
gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
- 8, (gpointer) &entry, sizeof(entry));
+ 8, reinterpret_cast<const guchar *>(&entry), sizeof(entry));
break;
case TARGET_TEXT_PLAIN:
}
-static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *UNUSED(context),
+static void bar_pane_exif_dnd_receive(GtkWidget *pane, GdkDragContext *,
gint x, gint y,
GtkSelectionData *selection_data, guint info,
- guint UNUSED(time), gpointer UNUSED(data))
+ guint, gpointer)
{
PaneExifData *ped;
- GList *work, *list;
+ GList *work;
+ GList *list;
gint pos;
- GtkWidget *new_entry = NULL;
+ GtkWidget *new_entry = nullptr;
ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
if (!ped) return;
switch (info)
{
case TARGET_APP_EXIF_ENTRY:
- new_entry = *(gpointer *)gtk_selection_data_get_data(selection_data);
+ new_entry = GTK_WIDGET(*(gpointer *)gtk_selection_data_get_data(selection_data));
if (gtk_widget_get_parent(new_entry) && gtk_widget_get_parent(new_entry) != ped->vbox) bar_pane_exif_reparent_entry(new_entry, pane);
break;
default:
/** @FIXME this needs a check for valid exif keys */
- new_entry = bar_pane_exif_add_entry(ped, (gchar *)gtk_selection_data_get_data(selection_data), NULL, TRUE, FALSE);
+ new_entry = bar_pane_exif_add_entry(ped, reinterpret_cast<const gchar *>(gtk_selection_data_get_data(selection_data)), nullptr, TRUE, FALSE);
break;
}
pos = 0;
while (work)
{
- gint nx, ny;
- GtkWidget *entry = static_cast<GtkWidget *>(work->data);
+ gint nx;
+ gint ny;
+ auto entry = static_cast<GtkWidget *>(work->data);
GtkAllocation allocation;
work = work->next;
gtk_box_reorder_child(GTK_BOX(ped->vbox), new_entry, pos);
}
-static void bar_pane_exif_entry_dnd_begin(GtkWidget *entry, GdkDragContext *context, gpointer UNUSED(data))
+static void bar_pane_exif_entry_dnd_begin(GtkWidget *entry, GdkDragContext *context, gpointer)
{
- ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
+ auto ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
if (!ee) return;
dnd_set_drag_label(entry, context, ee->key);
}
-static void bar_pane_exif_entry_dnd_end(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context), gpointer UNUSED(data))
+static void bar_pane_exif_entry_dnd_end(GtkWidget *, GdkDragContext *, gpointer)
{
}
static void bar_pane_exif_entry_dnd_init(GtkWidget *entry)
{
- ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
+ auto ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
- gtk_drag_source_set(entry, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+ gtk_drag_source_set(entry, static_cast<GdkModifierType>(GDK_BUTTON1_MASK | GDK_BUTTON2_MASK),
bar_pane_exif_drag_types, n_exif_entry_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(entry), "drag_data_get",
G_CALLBACK(bar_pane_exif_entry_dnd_get), ee);
static void bar_pane_exif_dnd_init(GtkWidget *pane)
{
gtk_drag_dest_set(pane,
- 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_exif_drop_types, n_exif_entry_drop_types,
- GDK_ACTION_COPY | GDK_ACTION_MOVE);
+ static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE));
g_signal_connect(G_OBJECT(pane), "drag_data_received",
G_CALLBACK(bar_pane_exif_dnd_receive), NULL);
}
-static void bar_pane_exif_edit_close_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void bar_pane_exif_edit_close_cb(GtkWidget *, gpointer data)
{
- GenericDialog *gd = static_cast<GenericDialog *>(data);
+ auto gd = static_cast<GenericDialog *>(data);
generic_dialog_close(gd);
}
-static void bar_pane_exif_edit_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void bar_pane_exif_edit_destroy_cb(GtkWidget *, gpointer data)
{
- ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
+ auto cdd = static_cast<ConfDialogData *>(data);
g_signal_handlers_disconnect_by_func(cdd->widget, (gpointer)(bar_pane_exif_edit_close_cb), cdd->gd);
g_free(cdd);
}
-static void bar_pane_exif_edit_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
+static void bar_pane_exif_edit_cancel_cb(GenericDialog *, gpointer)
{
}
-static void bar_pane_exif_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
+static void bar_pane_exif_edit_ok_cb(GenericDialog *, gpointer data)
{
- ConfDialogData *cdd = static_cast<ConfDialogData *>(data);
+ auto cdd = static_cast<ConfDialogData *>(data);
/* either one or the other */
-
PaneExifData *ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(cdd->widget), "pane_data"));
- ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(cdd->widget), "entry_data"));
+
auto ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(cdd->widget), "pane_data"));
+ auto ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(cdd->widget), "entry_data"));
if (ped)
{
bar_pane_exif_add_entry(ped,
- gtk_entry_get_text(GTK_ENTRY(cdd->key_entry)),
- gtk_entry_get_text(GTK_ENTRY(cdd->title_entry)),
+ gq_gtk_entry_get_text(GTK_ENTRY(cdd->key_entry)),
+ gq_gtk_entry_get_text(GTK_ENTRY(cdd->title_entry)),
cdd->if_set, cdd->editable);
}
if (!pane) return;
g_free(ee->key);
- ee->key = g_strdup(gtk_entry_get_text(GTK_ENTRY(cdd->key_entry)));
- title = gtk_entry_get_text(GTK_ENTRY(cdd->title_entry));
+ ee->key = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(cdd->key_entry)));
+ title = gq_gtk_entry_get_text(GTK_ENTRY(cdd->title_entry));
if (!title || strlen(title) == 0)
{
g_free(ee->title);
/* the widget can be either ExifEntry (for editing) or Pane (for new entry)
we can decide it by the attached data */
- ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(widget), "entry_data"));
+ auto ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(widget), "entry_data"));
cdd = g_new0(ConfDialogData, 1);
g_signal_connect(G_OBJECT(widget), "destroy",
G_CALLBACK(bar_pane_exif_edit_close_cb), gd);
- generic_dialog_add_message(gd, NULL, ee ? _("Configure entry") : _("Add entry"), NULL, FALSE);
+ generic_dialog_add_message(gd, nullptr, ee ? _("Configure entry") : _("Add entry"), nullptr, FALSE);
- generic_dialog_add_button(gd, GTK_STOCK_OK, NULL,
+ generic_dialog_add_button(gd, GQ_ICON_OK, "OK",
bar_pane_exif_edit_ok_cb, TRUE);
table = pref_table_new(gd->vbox, 3, 2, FALSE, TRUE);
- pref_table_label(table, 0, 0, _("Key:"), 1.0);
+ pref_table_label(table, 0, 0, _("Key:"), GTK_ALIGN_END);
cdd->key_entry = gtk_entry_new();
gtk_widget_set_size_request(cdd->key_entry, 300, -1);
- if (ee) gtk_entry_set_text(GTK_ENTRY(cdd->key_entry), ee->key);
- gtk_table_attach_defaults(GTK_TABLE(table), cdd->key_entry, 1, 2, 0, 1);
+ if (ee) gq_gtk_entry_set_text(GTK_ENTRY(cdd->key_entry), ee->key);
+ gq_gtk_grid_attach_default(GTK_GRID(table), cdd->key_entry, 1, 2, 0, 1);
generic_dialog_attach_default(gd, cdd->key_entry);
gtk_widget_show(cdd->key_entry);
- pref_table_label(table, 0, 1, _("Title:"), 1.0);
+ pref_table_label(table, 0, 1, _("Title:"), GTK_ALIGN_END);
cdd->title_entry = gtk_entry_new();
gtk_widget_set_size_request(cdd->title_entry, 300, -1);
- if (ee) gtk_entry_set_text(GTK_ENTRY(cdd->title_entry), ee->title);
- gtk_table_attach_defaults(GTK_TABLE(table), cdd->title_entry, 1, 2, 1, 2);
+ if (ee) gq_gtk_entry_set_text(GTK_ENTRY(cdd->title_entry), ee->title);
+ gq_gtk_grid_attach_default(GTK_GRID(table), cdd->title_entry, 1, 2, 1, 2);
generic_dialog_attach_default(gd, cdd->title_entry);
gtk_widget_show(cdd->title_entry);
gtk_widget_show(gd->dialog);
}
-static void bar_pane_exif_conf_dialog_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
+static void bar_pane_exif_conf_dialog_cb(GtkWidget *, gpointer data)
{
- GtkWidget *widget = static_cast<GtkWidget *>(data);
+ auto widget = static_cast<GtkWidget *>(data);
bar_pane_exif_conf_dialog(widget);
}
-static void bar_pane_exif_delete_entry_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
+static void bar_pane_exif_delete_entry_cb(GtkWidget *, gpointer data)
{
- GtkWidget *entry = static_cast<GtkWidget *>(data);
- gtk_widget_destroy(entry);
+ auto entry = static_cast<GtkWidget *>(data);
+ g_object_unref(entry);
}
-static void bar_pane_exif_copy_entry_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
+#ifdef HAVE_GTK4
+static void bar_pane_exif_copy_entry_cb(GtkWidget *, gpointer data)
{
- GtkWidget *widget = static_cast<GtkWidget *>(data);
+/* @FIXME GTK4 stub */
+}
+#else
+static void bar_pane_exif_copy_entry_cb(GtkWidget *, gpointer data)
+{
+ auto widget = static_cast<GtkWidget *>(data);
GtkClipboard *clipboard;
const gchar *value;
ExifEntry *ee;
clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text(clipboard, value, -1);
}
+#endif
-static void bar_pane_exif_toggle_show_all_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
+static void bar_pane_exif_toggle_show_all_cb(GtkWidget *, gpointer data)
{
-
PaneExifData *ped = static_cast<PaneExifData *>(data);
+
auto ped = static_cast<PaneExifData *>(data);
ped->show_all = !ped->show_all;
bar_pane_exif_update(ped);
}
GtkWidget *menu;
/* the widget can be either ExifEntry (for editing) or Pane (for new entry)
we can decide it by the attached data */
- ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(widget), "entry_data"));
+ auto ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(widget), "entry_data"));
menu = popup_menu_short_lived();
gchar *del = g_strdup_printf(_("Remove \"%s\""), ee->title);
gchar *copy = g_strdup_printf(_("Copy \"%s\""), ee->title);
- menu_item_add_stock(menu, conf, GTK_STOCK_EDIT, G_CALLBACK(bar_pane_exif_conf_dialog_cb), widget);
- menu_item_add_stock(menu, del, GTK_STOCK_DELETE, G_CALLBACK(bar_pane_exif_delete_entry_cb), widget);
- menu_item_add_stock(menu, copy, GTK_STOCK_COPY, G_CALLBACK(bar_pane_exif_copy_entry_cb), widget);
+ menu_item_add_icon(menu, conf, GQ_ICON_EDIT, G_CALLBACK(bar_pane_exif_conf_dialog_cb), widget);
+ menu_item_add_icon(menu, del, GQ_ICON_DELETE, G_CALLBACK(bar_pane_exif_delete_entry_cb), widget);
+ menu_item_add_icon(menu, copy, GQ_ICON_COPY, G_CALLBACK(bar_pane_exif_copy_entry_cb), widget);
menu_item_add_divider(menu);
g_free(conf);
}
/* for the pane */
- menu_item_add_stock(menu, _("Add entry"), GTK_STOCK_ADD, G_CALLBACK(bar_pane_exif_conf_dialog_cb), ped->widget);
+ menu_item_add_icon(menu, _("Add entry"), GQ_ICON_ADD, G_CALLBACK(bar_pane_exif_conf_dialog_cb), ped->widget);
menu_item_add_check(menu, _("Show hidden entries"), ped->show_all, G_CALLBACK(bar_pane_exif_toggle_show_all_cb), ped);
- gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), nullptr);
}
static gboolean bar_pane_exif_menu_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
-
PaneExifData *ped = static_cast<PaneExifData *>(data);
+
auto ped = static_cast<PaneExifData *>(data);
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
bar_pane_exif_menu_popup(widget, ped);
return FALSE;
}
-static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer UNUSED(data))
+#ifdef HAVE_GTK4
+static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer)
+{
+/* @FIXME GTK4 stub */
+ return FALSE;
+}
+#else
+static gboolean bar_pane_exif_copy_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer)
{
const gchar *value;
GtkClipboard *clipboard;
return FALSE;
}
-
-
+#endif
static void bar_pane_exif_entry_write_config(GtkWidget *entry, GString *outstr, gint indent)
{
- ExifEntry *ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
+ auto ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
if (!ee) return;
WRITE_NL(); WRITE_STRING("<entry ");
static void bar_pane_exif_write_config(GtkWidget *pane, GString *outstr, gint indent)
{
PaneExifData *ped;
- GList *work, *list;
+ GList *work;
+ GList *list;
ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
if (!ped) return;
work = list;
while (work)
{
- GtkWidget *entry = static_cast<GtkWidget *>(work->data);
+ auto entry = static_cast<GtkWidget *>(work->data);
work = work->next;
bar_pane_exif_entry_write_config(entry, outstr, indent);
PaneExifData *ped;
GList *list;
GList *work_windows;
- GList *exif_list = NULL;
+ GList *exif_list = nullptr;
LayoutWindow *lw;
GtkWidget *bar;
GtkWidget *pane;
ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
list = gtk_container_get_children(GTK_CONTAINER(ped->vbox));
- while (list)
+ GList *work = list;
+ while (work)
{
- entry = static_cast<GtkWidget *>(list->data);
- list = list->next;
+ entry = static_cast<GtkWidget *>(work->data);
+ work = work->next;
ee = static_cast<ExifEntry *>(g_object_get_data(G_OBJECT(entry), "entry_data"));
exif_list = g_list_append(exif_list, g_strdup(ee->title));
exif_list = g_list_append(exif_list, g_strdup(ee->key));
return exif_list;
}
-//void bar_pane_exif_close(GtkWidget *widget)
-//{
- //PaneExifData *ped;
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+void bar_pane_exif_close_unused(GtkWidget *widget)
+{
+ PaneExifData *ped;
- //ped = g_object_get_data(G_OBJECT(widget), "pane_data");
- //if (!ped) return;
+ ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(widget), "pane_data"));
+ if (!ped) return;
- //gtk_widget_destroy(ped->vbox);
-//}
+ g_object_unref(ped->vbox);
+}
+#pragma GCC diagnostic pop
-static void bar_pane_exif_destroy(GtkWidget *UNUSED(widget), gpointer data)
+static void bar_pane_exif_destroy(GtkWidget *, gpointer data)
{
-
PaneExifData *ped = static_cast<PaneExifData *>(data);
+
auto ped = static_cast<PaneExifData *>(data);
file_data_unregister_notify_func(bar_pane_exif_notify_cb, ped);
g_object_unref(ped->size_group);
g_free(ped);
}
-//~ static void bar_pane_exif_size_request(GtkWidget *UNUSED(pane), GtkRequisition *requisition, gpointer data)
-//~ {
- //~ PaneExifData *ped = static_cast<//~ *>(data);
- //~ if (requisition->height < ped->min_height)
- //~ {
- //~ requisition->height = ped->min_height;
- //~ }
-//~ }
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+static void bar_pane_exif_size_request_unused(GtkWidget *, GtkRequisition *requisition, gpointer data)
+{
+ auto *ped = static_cast<PaneExifData *>(data);
+ if (requisition->height < ped->min_height)
+ {
+ requisition->height = ped->min_height;
+ }
+}
+#pragma GCC diagnostic pop
-static void bar_pane_exif_size_allocate(GtkWidget *UNUSED(pane), GtkAllocation *alloc, gpointer data)
+static void bar_pane_exif_size_allocate(GtkWidget *, GtkAllocation *alloc, gpointer data)
{
-
PaneExifData *ped = static_cast<PaneExifData *>(data);
+
auto ped = static_cast<PaneExifData *>(data);
ped->min_height = alloc->height;
gtk_widget_set_size_request(ped->widget, -1, ped->min_height);
}
ped->size_group = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
ped->widget = gtk_event_box_new();
ped->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
- gtk_container_add(GTK_CONTAINER(ped->widget), ped->vbox);
+ gq_gtk_container_add(GTK_WIDGET(ped->widget), ped->vbox);
gtk_widget_show(ped->vbox);
ped->min_height = MIN_HEIGHT;
GtkWidget *bar_pane_exif_new_from_config(const gchar **attribute_names, const gchar **attribute_values)
{
- gchar *title = NULL;
+ gchar *title = nullptr;
gchar *id = g_strdup("exif");
gboolean expanded = TRUE;
gboolean show_all = FALSE;
void bar_pane_exif_update_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values)
{
PaneExifData *ped;
- gchar *title = NULL;
+ gchar *title = nullptr;
ped = static_cast<PaneExifData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
if (!ped) return;
void bar_pane_exif_entry_add_from_config(GtkWidget *pane, const gchar **attribute_names, const gchar **attribute_values)
{
PaneExifData *ped;
- gchar *key = NULL;
- gchar *title = NULL;
+ gchar *key = nullptr;
+ gchar *title = nullptr;
gboolean if_set = TRUE;
gboolean editable = FALSE;
projects / geeqie.git / blobdiff