#include "pan-view.h"
+#include <config.h>
+
#include "bar-exif.h"
+#include "compat.h"
+#include "debug.h"
#include "dnd.h"
#include "editors.h"
#include "exif.h"
#include "fullscreen.h"
#include "image.h"
#include "img-view.h"
+#include "intl.h"
#include "layout-util.h"
+#include "main-defines.h"
+#include "main.h"
#include "menu.h"
#include "metadata.h"
+#include "misc.h"
#include "pan-calendar.h"
#include "pan-folder.h"
#include "pan-grid.h"
+#include "pan-item.h"
#include "pan-timeline.h"
#include "pan-util.h"
#include "pan-view-filter.h"
#include "pan-view-search.h"
+#include "pixbuf-renderer.h"
#include "pixbuf-util.h"
#include "thumb.h"
#include "ui-fileops.h"
#include "utilops.h"
#include "window.h"
-#include <math.h>
+#include <cmath>
-#define PAN_WINDOW_DEFAULT_WIDTH 720
-#define PAN_WINDOW_DEFAULT_HEIGHT 500
+enum {
+ PAN_WINDOW_DEFAULT_WIDTH = 720,
+ PAN_WINDOW_DEFAULT_HEIGHT = 500
+};
-#define PAN_TILE_SIZE 512
+enum {
+ PAN_TILE_SIZE = 512
+};
#define ZOOM_INCREMENT 1.0
-#define ZOOM_LABEL_WIDTH 64
+enum {
+ ZOOM_LABEL_WIDTH = 64
+};
#define PAN_PREF_GROUP "pan_view_options"
#define PAN_PREF_INFO_EXIF "info_includes_exif"
-static GList *pan_window_list = NULL;
+static GList *pan_window_list = nullptr;
static void pan_layout_update_idle(PanWindow *pw);
{GDK_CONTROL_MASK, 'W', N_("Close window")},
{GDK_CONTROL_MASK, 'F', N_("Display Find search bar")},
{GDK_CONTROL_MASK, 'G', N_("Start search")},
- {0, GDK_KEY_Escape, N_("Exit fullscreen")},
- {0, GDK_KEY_Escape, N_("Hide Find search bar")},
- {0, GDK_KEY_equal, N_("Zoom in")},
- {0, GDK_KEY_plus, N_("Zoom in")},
- {0, GDK_KEY_minus, N_("Zoom out")},
- {0, GDK_KEY_Z, N_("Zoom 1:1")},
- {0, GDK_KEY_1, N_("Zoom 1:1")},
- {0, GDK_KEY_KP_Divide, N_("Zoom 1:1")},
- {0, '2', N_("Zoom 2:1")},
- {0, '3', N_("Zoom 3:1")},
- {0, '4', N_("Zoom 4:1")},
- {0, '7', N_("Zoom 1:4")},
- {0, '8', N_("Zoom 1:3")},
- {0, '9', N_("Zoom 1:2")},
- {0, 'F', N_("Full screen")},
- {0, 'V', N_("Full screen")},
- {0, GDK_KEY_F11, N_("Full screen")},
- {0, '/', N_("Display Find search bar")},
- {0, GDK_KEY_Left, N_("Scroll left")},
- {0, GDK_KEY_Right, N_("Scroll right")},
- {0, GDK_KEY_Up, N_("Scroll up")},
- {0, GDK_KEY_Down, N_("Scroll down")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Escape, N_("Exit fullscreen")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Escape, N_("Hide Find search bar")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_equal, N_("Zoom in")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_plus, N_("Zoom in")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_minus, N_("Zoom out")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Z, N_("Zoom 1:1")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_1, N_("Zoom 1:1")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_KP_Divide, N_("Zoom 1:1")},
+ {static_cast<GdkModifierType>(0), '2', N_("Zoom 2:1")},
+ {static_cast<GdkModifierType>(0), '3', N_("Zoom 3:1")},
+ {static_cast<GdkModifierType>(0), '4', N_("Zoom 4:1")},
+ {static_cast<GdkModifierType>(0), '7', N_("Zoom 1:4")},
+ {static_cast<GdkModifierType>(0), '8', N_("Zoom 1:3")},
+ {static_cast<GdkModifierType>(0), '9', N_("Zoom 1:2")},
+ {static_cast<GdkModifierType>(0), 'F', N_("Full screen")},
+ {static_cast<GdkModifierType>(0), 'V', N_("Full screen")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_F11, N_("Full screen")},
+ {static_cast<GdkModifierType>(0), '/', N_("Display Find search bar")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Left, N_("Scroll left")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Right, N_("Scroll right")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Up, N_("Scroll up")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Down, N_("Scroll down")},
{GDK_SHIFT_MASK, GDK_KEY_Left, N_("Scroll left faster")},
{GDK_SHIFT_MASK, GDK_KEY_Right, N_("Scroll right faster")},
{GDK_SHIFT_MASK, GDK_KEY_Up, N_("Scroll up faster")},
{GDK_SHIFT_MASK, GDK_KEY_Down, N_("Scroll down faster")},
- {0, GDK_KEY_Page_Up, N_("Scroll display half screen up")},
- {0, GDK_KEY_Page_Down, N_("Scroll display half screen down")},
- {0, GDK_KEY_Home, N_("Scroll display half screen left")},
- {0, GDK_KEY_End, N_("Scroll display half screen right")},
- {0, 0, NULL}
+ {static_cast<GdkModifierType>(0), GDK_KEY_Page_Up, N_("Scroll display half screen up")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Page_Down, N_("Scroll display half screen down")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Home, N_("Scroll display half screen left")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_End, N_("Scroll display half screen right")},
+ {static_cast<GdkModifierType>(0), 0, nullptr}
};
/*
static void pan_queue_thumb_done_cb(ThumbLoader *tl, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
if (pw->queue_pi)
{
gint rc;
pi = pw->queue_pi;
- pw->queue_pi = NULL;
+ pw->queue_pi = nullptr;
pi->queued = FALSE;
}
thumb_loader_free(pw->tl);
- pw->tl = NULL;
+ pw->tl = nullptr;
while (pan_queue_step(pw));
}
static void pan_queue_image_done_cb(ImageLoader *il, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
- GdkPixbuf *rotated = NULL;
+ auto pw = static_cast<PanWindow *>(data);
+ GdkPixbuf *rotated = nullptr;
if (pw->queue_pi)
{
gint rc;
pi = pw->queue_pi;
- pw->queue_pi = NULL;
+ pw->queue_pi = nullptr;
pi->queued = FALSE;
tmp = pi->pixbuf;
pi->pixbuf = gdk_pixbuf_scale_simple(tmp, pi->width, pi->height,
- (GdkInterpType)options->image.zoom_quality);
+ static_cast<GdkInterpType>(options->image.zoom_quality));
g_object_unref(tmp);
}
}
image_loader_free(pw->il);
- pw->il = NULL;
+ pw->il = nullptr;
while (pan_queue_step(pw));
}
if (!pw->queue) return FALSE;
- pi = pw->queue->data;
+ pi = static_cast<PanItem *>(pw->queue->data);
pw->queue = g_list_remove(pw->queue, pi);
pw->queue_pi = pi;
if (!pw->queue_pi->fd)
{
pw->queue_pi->queued = FALSE;
- pw->queue_pi = NULL;
+ pw->queue_pi = nullptr;
return TRUE;
}
image_loader_free(pw->il);
- pw->il = NULL;
+ pw->il = nullptr;
thumb_loader_free(pw->tl);
- pw->tl = NULL;
+ pw->tl = nullptr;
if (pi->type == PAN_ITEM_IMAGE)
{
if (image_loader_start(pw->il)) return FALSE;
image_loader_free(pw->il);
- pw->il = NULL;
+ pw->il = nullptr;
}
else if (pi->type == PAN_ITEM_THUMB)
{
thumb_loader_set_callbacks(pw->tl,
pan_queue_thumb_done_cb,
pan_queue_thumb_done_cb,
- NULL, pw);
+ nullptr, pw);
if (thumb_loader_start(pw->tl, pi->fd)) return FALSE;
thumb_loader_free(pw->tl);
- pw->tl = NULL;
+ pw->tl = nullptr;
}
pw->queue_pi->queued = FALSE;
- pw->queue_pi = NULL;
+ pw->queue_pi = nullptr;
return TRUE;
}
static gboolean pan_window_request_tile_cb(PixbufRenderer *pr, gint x, gint y,
gint width, gint height, GdkPixbuf *pixbuf, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
GList *list;
GList *work;
gint i;
for (i = (x / PAN_GRID_SIZE) * PAN_GRID_SIZE; i < x + width; i += PAN_GRID_SIZE)
{
- gint rx, ry, rw, rh;
+ gint rx;
+ gint ry;
+ gint rw;
+ gint rh;
if (util_clip_region(x, y, width, height,
i, y, 1, height,
}
for (i = (y / PAN_GRID_SIZE) * PAN_GRID_SIZE; i < y + height; i += PAN_GRID_SIZE)
{
- gint rx, ry, rw, rh;
+ gint rx;
+ gint ry;
+ gint rw;
+ gint rh;
if (util_clip_region(x, y, width, height,
x, i, width, 1,
PanItem *pi;
gboolean queue = FALSE;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
pi->refcount++;
return TRUE;
}
-static void pan_window_dispose_tile_cb(PixbufRenderer *UNUSED(pr), gint x, gint y,
- gint width, gint height, GdkPixbuf *UNUSED(pixbuf), gpointer data)
+static void pan_window_dispose_tile_cb(PixbufRenderer *, gint x, gint y,
+ gint width, gint height, GdkPixbuf *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
GList *list;
GList *work;
{
PanItem *pi;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (pi->refcount > 0)
pw->queue = g_list_remove(pw->queue, pi);
pi->queued = FALSE;
}
- if (pw->queue_pi == pi) pw->queue_pi = NULL;
+ if (pw->queue_pi == pi) pw->queue_pi = nullptr;
if (pi->pixbuf)
{
g_object_unref(pi->pixbuf);
- pi->pixbuf = NULL;
+ pi->pixbuf = nullptr;
}
}
}
{
PanItem *pi;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (pi->fd &&
{
PanItem *pi;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (pi->fd &&
message = g_strdup_printf(_("The pan view does not support the folder \"%s\"."), path);
warning_dialog(_("Folder not supported"), message,
- GTK_STOCK_DIALOG_INFO, parent);
+ GQ_ICON_DIALOG_INFO, parent);
g_free(message);
}
static gint pan_cache_sort_file_cb(gpointer a, gpointer b)
{
- PanCacheData *pca = a;
- PanCacheData *pcb = b;
+ auto pca = static_cast<PanCacheData *>(a);
+ auto pcb = static_cast<PanCacheData *>(b);
return filelist_sort_compare_filedata(pca->fd, pcb->fd);
}
-GList *pan_cache_sort(GList *list, SortType method, gboolean ascend)
+GList *pan_cache_sort(GList *list, SortType method, gboolean ascend, gboolean case_sensitive)
{
- return filelist_sort_full(list, method, ascend, (GCompareFunc) pan_cache_sort_file_cb);
+ return filelist_sort_full(list, method, ascend, case_sensitive, reinterpret_cast<GCompareFunc>(pan_cache_sort_file_cb));
}
static void pan_cache_free(PanWindow *pw)
{
- GList *work;
-
- work = pw->cache_list;
- while (work)
+ g_list_free_full(pw->cache_list, [](gpointer data)
{
- PanCacheData *pc;
-
- pc = work->data;
- work = work->next;
-
+ auto pc = static_cast<PanCacheData *>(data);
cache_sim_data_free(pc->cd);
file_data_unref(pc->fd);
g_free(pc);
- }
-
- g_list_free(pw->cache_list);
- pw->cache_list = NULL;
+ });
+ pw->cache_list = nullptr;
filelist_free(pw->cache_todo);
- pw->cache_todo = NULL;
+ pw->cache_todo = nullptr;
pw->cache_count = 0;
pw->cache_total = 0;
pw->cache_tick = 0;
cache_loader_free(pw->cache_cl);
- pw->cache_cl = NULL;
+ pw->cache_cl = nullptr;
}
static void pan_cache_fill(PanWindow *pw, FileData *dir_fd)
pan_cache_free(pw);
- list = pan_list_tree(dir_fd, SORT_NAME, TRUE, pw->ignore_symlinks);
+ list = pan_list_tree(dir_fd, SORT_NAME, TRUE, TRUE, pw->ignore_symlinks);
pw->cache_todo = g_list_reverse(list);
pw->cache_total = g_list_length(pw->cache_todo);
}
-static void pan_cache_step_done_cb(CacheLoader *cl, gint UNUSED(error), gpointer data)
+static void pan_cache_step_done_cb(CacheLoader *cl, gint, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
if (pw->cache_list)
{
PanCacheData *pc;
- pc = pw->cache_list->data;
+ pc = static_cast<PanCacheData *>(pw->cache_list->data);
if (!pc->cd)
{
pc->cd = cl->cd;
- cl->cd = NULL;
+ cl->cd = nullptr;
}
}
cache_loader_free(cl);
- pw->cache_cl = NULL;
+ pw->cache_cl = nullptr;
pan_layout_update_idle(pw);
}
if (!pw->cache_todo) return TRUE;
- fd = pw->cache_todo->data;
+ fd = static_cast<FileData *>(pw->cache_todo->data);
pw->cache_todo = g_list_remove(pw->cache_todo, fd);
pc = g_new0(PanCacheData, 1);
pc->fd = file_data_ref(fd);
- pc->cd = NULL;
+ pc->cd = nullptr;
pw->cache_list = g_list_prepend(pw->cache_list, pc);
cache_loader_free(pw->cache_cl);
load_mask = CACHE_LOADER_NONE;
- if (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE) load_mask |= CACHE_LOADER_DIMENSIONS;
- if (pw->exif_date_enable) load_mask |= CACHE_LOADER_DATE;
+ if (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE) load_mask = static_cast<CacheDataType>(load_mask | CACHE_LOADER_DIMENSIONS);
+ if (pw->exif_date_enable) load_mask = static_cast<CacheDataType>(load_mask | CACHE_LOADER_DATE);
pw->cache_cl = cache_loader_new(pc->fd, load_mask,
pan_cache_step_done_cb, pw);
- return (pw->cache_cl == NULL);
+ return (pw->cache_cl == nullptr);
}
/* This sync date function is optimized for lists with a common sort */
FileData *fd;
GList *needle;
- fd = work->data;
+ fd = static_cast<FileData *>(work->data);
work = work->next;
needle = haystack;
{
PanCacheData *pc;
- pc = needle->data;
+ pc = static_cast<PanCacheData *>(needle->data);
if (pc->fd == fd)
{
if (pc->cd && pc->cd->have_date && pc->cd->date >= 0)
}
haystack = g_list_delete_link(haystack, needle);
- needle = NULL;
+ needle = nullptr;
}
else
{
static void pan_grid_clear(PanWindow *pw)
{
- GList *work;
-
- work = pw->list_grid;
- while (work)
+ g_list_free_full(pw->list_grid, [](gpointer data)
{
- PanGrid *pg;
-
- pg = work->data;
- work = work->next;
-
+ auto pg = static_cast<PanGrid *>(data);
g_list_free(pg->list);
g_free(pg);
- }
-
- g_list_free(pw->list_grid);
- pw->list_grid = NULL;
+ });
+ pw->list_grid = nullptr;
pw->list = g_list_concat(pw->list, pw->list_static);
- pw->list_static = NULL;
+ pw->list_static = nullptr;
}
static void pan_grid_build(PanWindow *pw, gint width, gint height, gint grid_size)
{
GList *work;
- gint col, row;
- gint cw, ch;
+ gint col;
+ gint row;
+ gint cw;
+ gint ch;
gint l;
- gint i, j;
+ gint i;
+ gint j;
pan_grid_clear(pw);
if (l < 1) return;
- col = (gint)(sqrt((gdouble)l / grid_size) * width / height + 0.999);
+ col = static_cast<gint>(sqrt(static_cast<gdouble>(l) / grid_size) * width / height + 0.999);
col = CLAMP(col, 1, l / grid_size + 1);
- row = (gint)((gdouble)l / grid_size / col);
+ row = static_cast<gint>(static_cast<gdouble>(l) / grid_size / col);
if (row < 1) row = 1;
/* limit minimum size of grid so that a tile will always fit regardless of position */
PanItem *pi;
GList *grid;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
grid = pw->list_grid;
while (grid)
{
PanGrid *pg;
- gint rx, ry, rw, rh;
+ gint rx;
+ gint ry;
+ gint rw;
+ gint rh;
- pg = grid->data;
+ pg = static_cast<PanGrid *>(grid->data);
grid = grid->next;
if (util_clip_region(pi->x, pi->y, pi->width, pi->height,
{
PanGrid *pg;
- pg = work->data;
+ pg = static_cast<PanGrid *>(work->data);
work = work->next;
pg->list = g_list_reverse(pg->list);
}
pw->list_static = pw->list;
- pw->list = NULL;
+ pw->list = nullptr;
}
static void pan_window_items_free(PanWindow *pw)
{
- GList *work;
-
pan_grid_clear(pw);
- work = pw->list;
- while (work)
- {
- PanItem *pi = (PanItem *)work->data;
- work = work->next;
-
- pan_item_free(pi);
- }
-
- g_list_free(pw->list);
- pw->list = NULL;
+ g_list_free_full(pw->list, reinterpret_cast<GDestroyNotify>(pan_item_free));
+ pw->list = nullptr;
g_list_free(pw->queue);
- pw->queue = NULL;
- pw->queue_pi = NULL;
+ pw->queue = nullptr;
+ pw->queue_pi = nullptr;
image_loader_free(pw->il);
- pw->il = NULL;
+ pw->il = nullptr;
thumb_loader_free(pw->tl);
- pw->tl = NULL;
+ pw->tl = nullptr;
- pw->click_pi = NULL;
- pw->search_pi = NULL;
+ pw->click_pi = nullptr;
+ pw->search_pi = nullptr;
}
while (work)
{
PanItem *pi;
- gint rx, ry, rw, rh;
+ gint rx;
+ gint ry;
+ gint rw;
+ gint rh;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (util_clip_region(x, y, width, height,
GList *pan_layout_intersect(PanWindow *pw, gint x, gint y, gint width, gint height)
{
- GList *list = NULL;
+ GList *list = nullptr;
GList *grid;
- PanGrid *pg = NULL;
+ PanGrid *pg = nullptr;
grid = pw->list_grid;
while (grid && !pg)
{
- pg = grid->data;
+ pg = static_cast<PanGrid *>(grid->data);
grid = grid->next;
if (x < pg->x || x + width > pg->x + pg->w ||
y < pg->y || y + height > pg->y + pg->h)
{
- pg = NULL;
+ pg = nullptr;
}
}
{
PanItem *pi;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (width < pi->x + pi->width) width = pi->x + pi->width;
{
PanItem *pi;
- pi = work->data;
+ pi = static_cast<PanItem *>(work->data);
work = work->next;
if (width < pi->x + pi->width) width = pi->x + pi->width;
static gint pan_layout_update_idle_cb(gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
gint width;
gint height;
gint scroll_x;
if (pw->cache_todo)
{
pan_window_message(pw, _("Reading image data..."));
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
}
if (pw->cache_todo)
pw->cache_tick = 0;
}
- if (pan_cache_step(pw)) return TRUE;
+ if (pan_cache_step(pw)) return G_SOURCE_CONTINUE;
pw->idle_id = 0;
- return FALSE;
+ return G_SOURCE_REMOVE;
}
}
pixbuf_renderer_scroll_to_point(PIXBUF_RENDERER(pw->imd->pr), scroll_x, scroll_y, align, align);
}
- pan_window_message(pw, NULL);
+ pan_window_message(pw, nullptr);
pw->idle_id = 0;
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static void pan_layout_update_idle(PanWindow *pw)
FileData *pan_menu_click_fd(PanWindow *pw)
{
if (pw->click_pi && pw->click_pi->fd) return pw->click_pi->fd;
- return NULL;
+ return nullptr;
}
static gboolean pan_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
PixbufRenderer *pr;
FileData *fd;
gboolean stop_signal = FALSE;
case '0':
break;
case 'C': case 'c':
- if (fd) file_util_copy(fd, NULL, NULL, GTK_WIDGET(pr));
+ if (fd) file_util_copy(fd, nullptr, nullptr, GTK_WIDGET(pr));
break;
case 'M': case 'm':
- if (fd) file_util_move(fd, NULL, NULL, GTK_WIDGET(pr));
+ if (fd) file_util_move(fd, nullptr, nullptr, GTK_WIDGET(pr));
break;
case 'R': case 'r':
- if (fd) file_util_rename(fd, NULL, GTK_WIDGET(pr));
+ if (fd) file_util_rename(fd, nullptr, GTK_WIDGET(pr));
break;
case 'D': case 'd':
if (fd)
{
options->file_ops.safe_delete_enable = TRUE;
- file_util_delete(fd, NULL, GTK_WIDGET(pr));
+ file_util_delete(fd, nullptr, GTK_WIDGET(pr));
}
break;
case 'F': case 'f':
case GDK_KEY_Menu:
case GDK_KEY_F10:
menu = pan_popup_menu(pw);
- gtk_menu_popup_at_widget(GTK_MENU(menu), widget, GDK_GRAVITY_SOUTH, GDK_GRAVITY_CENTER, NULL);
+ gtk_menu_popup_at_widget(GTK_MENU(menu), widget, GDK_GRAVITY_SOUTH, GDK_GRAVITY_CENTER, nullptr);
break;
case '/':
exif_list = bar_pane_exif_list();
while (exif_list)
{
- title = exif_list->data;
+ title = static_cast<gchar *>(exif_list->data);
exif_list = exif_list->next;
- key = exif_list->data;
+ key = static_cast<gchar *>(exif_list->data);
exif_list = exif_list->next;
text = metadata_read_string(fd, key, METADATA_FORMATTED);
g_free(text);
}
- string_list_free(exif_list);
+ g_list_free_full(exif_list, g_free);
}
PanItem *pbox;
PanItem *p;
gchar *buf;
- gint x1, y1, x2, y2, x3, y3;
- gint x, y, w, h;
+ gint x1;
+ gint y1;
+ gint x2;
+ gint y2;
+ gint x3;
+ gint y3;
+ gint x;
+ gint y;
+ gint w;
+ gint h;
if (pw->click_pi == pi) return;
- if (pi && !pi->fd) pi = NULL;
+ if (pi && !pi->fd) pi = nullptr;
while ((p = pan_item_find_by_key(pw, PAN_ITEM_NONE, "info"))) pan_item_remove(pw, p);
pw->click_pi = pi;
DEBUG_1("info set to %s", pi->fd->path);
- pbox = pan_item_box_new(pw, NULL, pi->x + pi->width + 4, pi->y, 10, 10,
+ pbox = pan_item_box_new(pw, nullptr, pi->x + pi->width + 4, pi->y, 10, 10,
PAN_POPUP_BORDER,
PAN_POPUP_COLOR, PAN_POPUP_ALPHA,
PAN_POPUP_BORDER_COLOR, PAN_POPUP_ALPHA);
util_clip_triangle(x1, y1, x2, y2, x3, y3,
&x, &y, &w, &h);
- p = pan_item_tri_new(pw, NULL, x, y, w, h,
+ p = pan_item_tri_new(pw, nullptr, x, y, w, h,
x1, y1, x2, y2, x3, y3,
PAN_POPUP_COLOR, PAN_POPUP_ALPHA);
pan_item_tri_border(p, PAN_BORDER_1 | PAN_BORDER_3, PAN_POPUP_BORDER_COLOR, PAN_POPUP_ALPHA);
if (pw->info_image_size > PAN_IMAGE_SIZE_THUMB_NONE)
{
- gint iw, ih;
+ gint iw;
+ gint ih;
if (image_load_dimensions(pi->fd, &iw, &ih))
{
gint scale = 25;
iw = MAX(1, iw * scale / 100);
ih = MAX(1, ih * scale / 100);
- pbox = pan_item_box_new(pw, NULL, pbox->x, pbox->y + pbox->height + 8, 10, 10,
+ pbox = pan_item_box_new(pw, nullptr, pbox->x, pbox->y + pbox->height + 8, 10, 10,
PAN_POPUP_BORDER,
PAN_POPUP_COLOR, PAN_POPUP_ALPHA,
PAN_POPUP_BORDER_COLOR, PAN_POPUP_ALPHA);
static void button_cb(PixbufRenderer *pr, GdkEventButton *event, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
- PanItem *pi = NULL;
+ auto pw = static_cast<PanWindow *>(data);
+ PanItem *pi = nullptr;
GtkWidget *menu;
- gint rx, ry;
+ gint rx;
+ gint ry;
rx = ry = 0;
if (pr->scale)
{
- rx = (gdouble)(pr->x_scroll + event->x - pr->x_offset) / pr->scale;
- ry = (gdouble)(pr->y_scroll + event->y - pr->y_offset) / pr->scale;
+ rx = static_cast<gdouble>(pr->x_scroll + event->x - pr->x_offset) / pr->scale;
+ ry = static_cast<gdouble>(pr->y_scroll + event->y - pr->y_offset) / pr->scale;
}
pi = pan_item_find_by_coord(pw, PAN_ITEM_BOX, rx, ry, "info");
if (pi && event->button == MOUSE_BUTTON_LEFT)
{
- pan_info_update(pw, NULL);
+ pan_info_update(pw, nullptr);
return;
}
pi = pan_item_find_by_coord(pw, (pw->size > PAN_IMAGE_SIZE_THUMB_LARGE) ? PAN_ITEM_IMAGE : PAN_ITEM_THUMB,
- rx, ry, NULL);
+ rx, ry, nullptr);
switch (event->button)
{
case MOUSE_BUTTON_RIGHT:
pan_info_update(pw, pi);
menu = pan_popup_menu(pw);
- gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), nullptr);
break;
default:
break;
}
}
-static void scroll_cb(PixbufRenderer *pr, GdkEventScroll *event, gpointer UNUSED(data))
+static void scroll_cb(PixbufRenderer *pr, GdkEventScroll *event, gpointer)
{
- gint w, h;
+ gint w;
+ gint h;
w = pr->vis_width;
h = pr->vis_height;
{
case GDK_SCROLL_UP:
pixbuf_renderer_zoom_adjust_at_point(pr, ZOOM_INCREMENT,
- (gint)event->x, (gint)event->y);
+ static_cast<gint>(event->x), static_cast<gint>(event->y));
break;
case GDK_SCROLL_DOWN:
pixbuf_renderer_zoom_adjust_at_point(pr, -ZOOM_INCREMENT,
- (gint)event->x, (gint)event->y);
+ static_cast<gint>(event->x), static_cast<gint>(event->y));
break;
default:
break;
G_CALLBACK(scroll_cb), pw);
}
-static void pan_fullscreen_stop_func(FullScreenData *UNUSED(fs), gpointer data)
+static void pan_fullscreen_stop_func(FullScreenData *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
- pw->fs = NULL;
+ pw->fs = nullptr;
pw->imd = pw->imd_normal;
}
}
}
-static void pan_window_image_zoom_cb(PixbufRenderer *UNUSED(pr), gdouble UNUSED(zoom), gpointer data)
+static void pan_window_image_zoom_cb(PixbufRenderer *, gdouble, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
gchar *text;
text = image_zoom_get_as_text(pw->imd);
static void pan_window_image_scroll_notify_cb(PixbufRenderer *pr, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
GtkAdjustment *adj;
GdkRectangle rect;
- gint width, height;
+ gint width;
+ gint height;
if (pr->scale == 0.0) return;
gtk_adjustment_set_step_increment(adj, 48.0 / pr->scale);
gtk_adjustment_set_lower(adj, 0.0);
gtk_adjustment_set_upper(adj, MAX((gdouble)width, 1.0));
- gtk_adjustment_set_value(adj, (gdouble)rect.x);
+ gtk_adjustment_set_value(adj, static_cast<gdouble>(rect.x));
pref_signal_block_data(pw->scrollbar_h, pw);
- gtk_adjustment_changed(adj);
- gtk_adjustment_value_changed(adj);
pref_signal_unblock_data(pw->scrollbar_h, pw);
adj = gtk_range_get_adjustment(GTK_RANGE(pw->scrollbar_v));
gtk_adjustment_set_step_increment(adj, 48.0 / pr->scale);
gtk_adjustment_set_lower(adj, 0.0);
gtk_adjustment_set_upper(adj, MAX((gdouble)height, 1.0));
- gtk_adjustment_set_value(adj, (gdouble)rect.y);
+ gtk_adjustment_set_value(adj, static_cast<gdouble>(rect.y));
pref_signal_block_data(pw->scrollbar_v, pw);
- gtk_adjustment_changed(adj);
- gtk_adjustment_value_changed(adj);
pref_signal_unblock_data(pw->scrollbar_v, pw);
}
static void pan_window_scrollbar_h_value_cb(GtkRange *range, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
PixbufRenderer *pr;
gint x;
if (!pr->scale) return;
- x = (gint)gtk_range_get_value(range);
+ x = static_cast<gint>(gtk_range_get_value(range));
- pixbuf_renderer_scroll_to_point(pr, x, (gint)((gdouble)pr->y_scroll / pr->scale), 0.0, 0.0);
+ pixbuf_renderer_scroll_to_point(pr, x, static_cast<gint>(static_cast<gdouble>(pr->y_scroll) / pr->scale), 0.0, 0.0);
}
static void pan_window_scrollbar_v_value_cb(GtkRange *range, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
PixbufRenderer *pr;
gint y;
if (!pr->scale) return;
- y = (gint)gtk_range_get_value(range);
+ y = static_cast<gint>(gtk_range_get_value(range));
- pixbuf_renderer_scroll_to_point(pr, (gint)((gdouble)pr->x_scroll / pr->scale), y, 0.0, 0.0);
+ pixbuf_renderer_scroll_to_point(pr, static_cast<gint>(static_cast<gdouble>(pr->x_scroll) / pr->scale), y, 0.0, 0.0);
}
static void pan_window_layout_change_cb(GtkWidget *combo, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
- pw->layout = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
+ pw->layout = static_cast<PanLayoutType>(gtk_combo_box_get_active(GTK_COMBO_BOX(combo)));
pan_layout_update(pw);
}
static void pan_window_layout_size_cb(GtkWidget *combo, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
- pw->size = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
+ pw->size = static_cast<PanImageSize>(gtk_combo_box_get_active(GTK_COMBO_BOX(combo)));
pan_layout_update(pw);
}
static void pan_window_entry_activate_cb(const gchar *new_text, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
gchar *path;
path = remove_trailing_slash(new_text);
{
warning_dialog(_("Folder not found"),
_("The entered path is not a folder"),
- GTK_STOCK_DIALOG_WARNING, pw->path_entry);
+ GQ_ICON_DIALOG_WARNING, pw->path_entry);
}
else
{
pan_fullscreen_toggle(pw, TRUE);
pan_search_ui_destroy(&pw->search_ui);
pan_filter_ui_destroy(&pw->filter_ui);
- gtk_widget_destroy(pw->window);
+ gq_gtk_widget_destroy(pw->window);
pan_window_items_free(pw);
pan_cache_free(pw);
g_free(pw);
}
-static gboolean pan_window_delete_cb(GtkWidget *UNUSED(w), GdkEventAny *UNUSED(event), gpointer data)
+static gboolean pan_window_delete_cb(GtkWidget *, GdkEventAny *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
pan_window_close(pw);
return TRUE;
pw->idle_id = 0;
- pw->window = window_new(GTK_WINDOW_TOPLEVEL, "panview", NULL, NULL, _("Pan View"));
+ pw->window = window_new("panview", nullptr, nullptr, _("Pan View"));
DEBUG_NAME(pw->window);
geometry.min_width = DEFAULT_MINIMAL_WINDOW_SIZE;
geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
- gtk_window_set_geometry_hints(GTK_WINDOW(pw->window), NULL, &geometry, GDK_HINT_MIN_SIZE);
+ gtk_window_set_geometry_hints(GTK_WINDOW(pw->window), nullptr, &geometry, GDK_HINT_MIN_SIZE);
gtk_window_set_resizable(GTK_WINDOW(pw->window), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(pw->window), 0);
pref_label_new(box, _("Location:"));
combo = tab_completion_new_with_history(&pw->path_entry, dir_fd->path, "pan_view_path", -1,
pan_window_entry_activate_cb, pw);
- gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(box), combo, TRUE, TRUE, 0);
gtk_widget_show(combo);
combo = gtk_combo_box_text_new();
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), pw->layout);
g_signal_connect(G_OBJECT(combo), "changed",
G_CALLBACK(pan_window_layout_change_cb), pw);
- gtk_box_pack_start(GTK_BOX(box), combo, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(box), combo, FALSE, FALSE, 0);
gtk_widget_show(combo);
combo = gtk_combo_box_text_new();
gtk_combo_box_set_active(GTK_COMBO_BOX(combo), pw->size);
g_signal_connect(G_OBJECT(combo), "changed",
G_CALLBACK(pan_window_layout_size_cb), pw);
- gtk_box_pack_start(GTK_BOX(box), combo, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(box), combo, FALSE, FALSE, 0);
gtk_widget_show(combo);
table = pref_table_new(vbox, 2, 2, FALSE, TRUE);
- gtk_table_set_row_spacings(GTK_TABLE(table), 2);
- gtk_table_set_col_spacings(GTK_TABLE(table), 2);
-
- /** @FIXME pan view does not work correctly when renderer-clutter()
- * is used.
- */
- gint temp = options->image.use_clutter_renderer;
- options->image.use_clutter_renderer = FALSE;
- pw->imd = image_new(TRUE);
- options->image.use_clutter_renderer = temp;
+ gtk_grid_set_row_spacing(GTK_GRID(table), 2);
+ gtk_grid_set_column_spacing(GTK_GRID(table), 2);
+ pw->imd = image_new(TRUE);
pw->imd_normal = pw->imd;
g_signal_connect(G_OBJECT(pw->imd->pr), "zoom",
g_signal_connect(G_OBJECT(pw->imd->pr), "scroll_notify",
G_CALLBACK(pan_window_image_scroll_notify_cb), pw);
- gtk_table_attach(GTK_TABLE(table), pw->imd->widget, 0, 1, 0, 1,
- GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0);
+ gq_gtk_grid_attach(GTK_GRID(table), pw->imd->widget, 0, 1, 0, 1, static_cast<GtkAttachOptions>(GTK_FILL | GTK_EXPAND), static_cast<GtkAttachOptions>(GTK_FILL | GTK_EXPAND), 0, 0);
gtk_widget_show(GTK_WIDGET(pw->imd->widget));
pan_window_dnd_init(pw);
pan_image_set_buttons(pw, pw->imd);
- pw->scrollbar_h = gtk_hscrollbar_new(NULL);
+ pw->scrollbar_h = gtk_scrollbar_new(GTK_ORIENTATION_HORIZONTAL, nullptr);
g_signal_connect(G_OBJECT(pw->scrollbar_h), "value_changed",
G_CALLBACK(pan_window_scrollbar_h_value_cb), pw);
- gtk_table_attach(GTK_TABLE(table), pw->scrollbar_h, 0, 1, 1, 2,
- GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gq_gtk_grid_attach(GTK_GRID(table), pw->scrollbar_h, 0, 1, 1, 2, static_cast<GtkAttachOptions>(GTK_FILL | GTK_EXPAND), static_cast<GtkAttachOptions>(0), 0, 0);
gtk_widget_show(pw->scrollbar_h);
- pw->scrollbar_v = gtk_vscrollbar_new(NULL);
+ pw->scrollbar_v = gtk_scrollbar_new(GTK_ORIENTATION_VERTICAL, nullptr);
g_signal_connect(G_OBJECT(pw->scrollbar_v), "value_changed",
G_CALLBACK(pan_window_scrollbar_v_value_cb), pw);
- gtk_table_attach(GTK_TABLE(table), pw->scrollbar_v, 1, 2, 0, 1,
- 0, GTK_FILL | GTK_EXPAND, 0, 0);
+ gq_gtk_grid_attach(GTK_GRID(table), pw->scrollbar_v, 1, 2, 0, 1, static_cast<GtkAttachOptions>(0), static_cast<GtkAttachOptions>(GTK_FILL | GTK_EXPAND), 0, 0);
gtk_widget_show(pw->scrollbar_v);
/* find bar */
pw->search_ui = pan_search_ui_new(pw);
- gtk_box_pack_start(GTK_BOX(vbox), pw->search_ui->search_box, FALSE, FALSE, 2);
+ gq_gtk_box_pack_start(GTK_BOX(vbox), pw->search_ui->search_box, FALSE, FALSE, 2);
/* filter bar */
pw->filter_ui = pan_filter_ui_new(pw);
- gtk_box_pack_start(GTK_BOX(vbox), pw->filter_ui->filter_box, FALSE, FALSE, 2);
+ gq_gtk_box_pack_start(GTK_BOX(vbox), pw->filter_ui->filter_box, FALSE, FALSE, 2);
/* status bar */
box = pref_box_new(vbox, FALSE, GTK_ORIENTATION_HORIZONTAL, 0);
- frame = gtk_frame_new(NULL);
+ frame = gtk_frame_new(nullptr);
DEBUG_NAME(frame);
- gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+ gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_widget_set_size_request(frame, ZOOM_LABEL_WIDTH, -1);
- gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
gtk_widget_show(frame);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
pref_spacer(hbox, 0);
pw->label_message = pref_label_new(hbox, "");
- frame = gtk_frame_new(NULL);
+ frame = gtk_frame_new(nullptr);
DEBUG_NAME(frame);
- gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+ gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
gtk_widget_set_size_request(frame, ZOOM_LABEL_WIDTH, -1);
- gtk_box_pack_end(GTK_BOX(box), frame, FALSE, FALSE, 0);
+ gq_gtk_box_pack_end(GTK_BOX(box), frame, FALSE, FALSE, 0);
gtk_widget_show(frame);
pw->label_zoom = gtk_label_new("");
gtk_widget_show(pw->label_zoom);
// Add the "Find" button to the status bar area.
- gtk_box_pack_end(GTK_BOX(box), pw->search_ui->search_button, FALSE, FALSE, 0);
+ gq_gtk_box_pack_end(GTK_BOX(box), pw->search_ui->search_button, FALSE, FALSE, 0);
gtk_widget_show(pw->search_ui->search_button);
// Add the "Filter" button to the status bar area.
- gtk_box_pack_end(GTK_BOX(box), pw->filter_ui->filter_button, FALSE, FALSE, 0);
+ gq_gtk_box_pack_end(GTK_BOX(box), pw->filter_ui->filter_button, FALSE, FALSE, 0);
gtk_widget_show(pw->filter_ui->filter_button);
g_signal_connect(G_OBJECT(pw->window), "delete_event",
static void pan_warning_ok_cb(GenericDialog *gd, gpointer data)
{
- FileData *dir_fd = (FileData *)data;
+ auto dir_fd = static_cast<FileData *>(data);
generic_dialog_close(gd);
file_data_unref(dir_fd);
}
-static void pan_warning_hide_cb(GtkWidget *button, gpointer UNUSED(data))
+static void pan_warning_hide_cb(GtkWidget *button, gpointer)
{
gboolean hide_dlg;
GenericDialog *gd;
GtkWidget *box;
GtkWidget *group;
- GtkWidget *button;
+ GtkWidget *checkbox;
GtkWidget *ct_button;
gboolean hide_dlg;
if (dir_fd && strcmp(dir_fd->path, G_DIR_SEPARATOR_S) == 0)
{
- pan_warning_folder(dir_fd->path, NULL);
+ pan_warning_folder(dir_fd->path, nullptr);
return TRUE;
}
if (!pref_list_int_get(PAN_PREF_GROUP, PAN_PREF_HIDE_WARNING, &hide_dlg)) hide_dlg = FALSE;
if (hide_dlg) return FALSE;
- gd = generic_dialog_new(_("Pan View Performance"), "pan_view_warning", NULL, FALSE,
- NULL, NULL);
+ gd = generic_dialog_new(_("Pan View Performance"), "pan_view_warning", nullptr, FALSE,
+ nullptr, nullptr);
gd->data = file_data_ref(dir_fd);
- generic_dialog_add_button(gd, GTK_STOCK_OK, NULL,
+ generic_dialog_add_button(gd, GQ_ICON_OK, "OK",
pan_warning_ok_cb, TRUE);
- box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO,
+ box = generic_dialog_add_message(gd, GQ_ICON_DIALOG_INFO,
_("Pan view performance may be poor."),
_("To improve the performance of thumbnails in\npan view the following options can be enabled.\n\nNote that both options must be enabled to\nnotice a change in performance."), TRUE);
ct_button = pref_checkbox_new_int(group, _("Cache thumbnails"),
options->thumbnails.enable_caching, &options->thumbnails.enable_caching);
- button = pref_checkbox_new_int(group, _("Use shared thumbnail cache"),
+ checkbox = pref_checkbox_new_int(group, _("Use shared thumbnail cache"),
options->thumbnails.spec_standard, &options->thumbnails.spec_standard);
- pref_checkbox_link_sensitivity(ct_button, button);
+ pref_checkbox_link_sensitivity(ct_button, checkbox);
pref_line(box, 0);
pref_checkbox_new(box, _("Do not show this dialog again"), hide_dlg,
- G_CALLBACK(pan_warning_hide_cb), NULL);
+ G_CALLBACK(pan_warning_hide_cb), nullptr);
gtk_widget_show(gd->dialog);
#define INFO_IMAGE_SIZE_KEY "image_size_data"
-static void pan_new_window_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_new_window_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
FileData *fd;
fd = pan_menu_click_fd(pw);
}
}
-static void pan_go_to_original_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_go_to_original_cb(GtkWidget *, gpointer data)
{
- LayoutWindow *lw = NULL;
- PanWindow *pw = (PanWindow *)data;
+ LayoutWindow *lw = nullptr;
+ auto pw = static_cast<PanWindow *>(data);
FileData *fd;
if (!layout_valid(&lw)) return;
{
PanWindow *pw;
FileData *fd;
- const gchar *key = data;
+ auto key = static_cast<const gchar *>(data);
- pw = submenu_item_get_data(widget);
+ pw = static_cast<PanWindow *>(submenu_item_get_data(widget));
if (!pw) return;
fd = pan_menu_click_fd(pw);
}
}
-static void pan_zoom_in_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_zoom_in_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
image_zoom_adjust(pw->imd, ZOOM_INCREMENT);
}
-static void pan_zoom_out_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_zoom_out_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
image_zoom_adjust(pw->imd, -ZOOM_INCREMENT);
}
-static void pan_zoom_1_1_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_zoom_1_1_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
image_zoom_set(pw->imd, 1.0);
}
-static void pan_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_copy_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
FileData *fd;
fd = pan_menu_click_fd(pw);
- if (fd) file_util_copy(fd, NULL, NULL, pw->imd->widget);
+ if (fd) file_util_copy(fd, nullptr, nullptr, pw->imd->widget);
}
-static void pan_move_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_move_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
FileData *fd;
fd = pan_menu_click_fd(pw);
- if (fd) file_util_move(fd, NULL, NULL, pw->imd->widget);
+ if (fd) file_util_move(fd, nullptr, nullptr, pw->imd->widget);
}
-static void pan_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_rename_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
FileData *fd;
fd = pan_menu_click_fd(pw);
- if (fd) file_util_rename(fd, NULL, pw->imd->widget);
+ if (fd) file_util_rename(fd, nullptr, pw->imd->widget);
}
-static void pan_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_delete_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
FileData *fd;
fd = pan_menu_click_fd(pw);
if (fd)
{
options->file_ops.safe_delete_enable = FALSE;
- file_util_delete(fd, NULL, pw->imd->widget);
+ file_util_delete(fd, nullptr, pw->imd->widget);
}
}
-static void pan_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_move_to_trash_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
FileData *fd;
fd = pan_menu_click_fd(pw);
if (fd)
{
options->file_ops.safe_delete_enable = TRUE;
- file_util_delete(fd, NULL, pw->imd->widget);
+ file_util_delete(fd, nullptr, pw->imd->widget);
}
}
-static void pan_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_copy_path_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
FileData *fd;
fd = pan_menu_click_fd(pw);
if (fd) file_util_copy_path_to_clipboard(fd, TRUE);
}
-static void pan_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_copy_path_unquoted_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
FileData *fd;
fd = pan_menu_click_fd(pw);
static void pan_exif_date_toggle_cb(GtkWidget *widget, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
pw->exif_date_enable = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
pan_layout_update(pw);
static void pan_info_toggle_exif_cb(GtkWidget *widget, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
pw->info_includes_exif = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
/** @FIXME sync info now */
static void pan_info_toggle_image_cb(GtkWidget *widget, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
pw->info_image_size = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), INFO_IMAGE_SIZE_KEY));
/** @FIXME sync info now */
}
-static void pan_fullscreen_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_fullscreen_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
pan_fullscreen_toggle(pw, FALSE);
}
-static void pan_close_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_close_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
pan_window_close(pw);
}
-static void pan_popup_menu_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_popup_menu_destroy_cb(GtkWidget *, gpointer data)
{
- GList *editmenu_fd_list = (GList *)data;
+ auto editmenu_fd_list = static_cast<GList *>(data);
filelist_free(editmenu_fd_list);
}
-static void pan_play_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void pan_play_cb(GtkWidget *, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
start_editor_from_file(options->image_l_click_video_editor, pw->click_pi->fd);
}
static GList *pan_view_get_fd_list(PanWindow *pw)
{
- GList *list = NULL;
+ GList *list = nullptr;
FileData *fd = pan_menu_click_fd(pw);
if (fd) list = g_list_prepend(filelist_copy(fd->sidecar_files), file_data_ref(fd));
/**
* @brief Add file selection list to a collection
- * @param[in] widget
+ * @param[in] widget
* @param[in] data Index to the collection list menu item selected, or -1 for new collection
- *
- *
+ *
+ *
*/
static void pan_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
{
PanWindow *pw;
- GList *selection_list = NULL;
+ GList *selection_list = nullptr;
- pw = submenu_item_get_data(widget);
+ pw = static_cast<PanWindow *>(submenu_item_get_data(widget));
selection_list = g_list_append(selection_list, pan_menu_click_fd(pw));
pop_menu_collections(selection_list, data);
GtkWidget *menu;
GtkWidget *submenu;
GtkWidget *item;
- gboolean active, video;
+ gboolean active;
+ gboolean video;
GList *editmenu_fd_list;
GtkAccelGroup *accel_group;
- active = (pw->click_pi != NULL);
+ active = (pw->click_pi != nullptr);
video = (active && pw->click_pi->fd && pw->click_pi->fd->format_class == FORMAT_CLASS_VIDEO);
menu = popup_menu_short_lived();
g_object_set_data(G_OBJECT(menu), "window_keys", pan_view_window_keys);
g_object_set_data(G_OBJECT(menu), "accel_group", accel_group);
- menu_item_add_stock_sensitive(menu, _("_Play"), GTK_STOCK_MEDIA_PLAY, video,
+ menu_item_add_icon_sensitive(menu, _("_Play"), GQ_ICON_PLAY, video,
G_CALLBACK(pan_play_cb), pw);
menu_item_add_divider(menu);
- menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN,
+ menu_item_add_icon(menu, _("Zoom _in"), GQ_ICON_ZOOM_IN,
G_CALLBACK(pan_zoom_in_cb), pw);
- menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT,
+ menu_item_add_icon(menu, _("Zoom _out"), GQ_ICON_ZOOM_OUT,
G_CALLBACK(pan_zoom_out_cb), pw);
- menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100,
+ menu_item_add_icon(menu, _("Zoom _1:1"), GQ_ICON_ZOOM_100,
G_CALLBACK(pan_zoom_1_1_cb), pw);
menu_item_add_divider(menu);
submenu_add_edit(menu, &item, G_CALLBACK(pan_edit_cb), pw, editmenu_fd_list);
gtk_widget_set_sensitive(item, active);
- menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, active,
+ menu_item_add_icon_sensitive(menu, _("View in _new window"), GQ_ICON_NEW, active,
G_CALLBACK(pan_new_window_cb), pw);
- menu_item_add_stock(menu, _("Go to original"), GTK_STOCK_FIND,
+ menu_item_add_icon(menu, _("Go to original"), GQ_ICON_FIND,
G_CALLBACK(pan_go_to_original_cb), pw);
menu_item_add_divider(menu);
- menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, active,
+ menu_item_add_icon_sensitive(menu, _("_Copy..."), GQ_ICON_COPY, active,
G_CALLBACK(pan_copy_cb), pw);
menu_item_add_sensitive(menu, _("_Move..."), active,
G_CALLBACK(pan_move_cb), pw);
G_CALLBACK(pan_copy_path_unquoted_cb), pw);
menu_item_add_divider(menu);
- menu_item_add_stock_sensitive(menu,
+ menu_item_add_icon_sensitive(menu,
options->file_ops.confirm_move_to_trash ? _("Move to Trash...") :
- _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, active,
+ _("Move to Trash"), GQ_ICON_DELETE, active,
G_CALLBACK(pan_move_to_trash_cb), pw);
- menu_item_add_stock_sensitive(menu,
+ menu_item_add_icon_sensitive(menu,
options->file_ops.confirm_delete ? _("_Delete...") :
- _("_Delete"), GTK_STOCK_DELETE, active,
+ _("_Delete"), GQ_ICON_DELETE_SHRED, active,
G_CALLBACK(pan_delete_cb), pw);
menu_item_add_divider(menu);
menu_item_add_check(menu, _("_Show Exif information"), pw->info_includes_exif,
G_CALLBACK(pan_info_toggle_exif_cb), pw);
- item = menu_item_add(menu, _("Show im_age"), NULL, NULL);
+ item = menu_item_add(menu, _("Show im_age"), nullptr, nullptr);
submenu = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
if (pw->fs)
{
- menu_item_add(menu, _("Exit _full screen"), G_CALLBACK(pan_fullscreen_cb), pw);
+ menu_item_add_icon(menu, _("Exit _full screen"), GQ_ICON_LEAVE_FULLSCREEN, G_CALLBACK(pan_fullscreen_cb), pw);
}
else
{
- menu_item_add(menu, _("_Full screen"), G_CALLBACK(pan_fullscreen_cb), pw);
+ menu_item_add_icon(menu, _("_Full screen"), GQ_ICON_FULLSCREEN, G_CALLBACK(pan_fullscreen_cb), pw);
}
menu_item_add_divider(menu);
- menu_item_add_stock(menu, _("C_lose window"), GTK_STOCK_CLOSE, G_CALLBACK(pan_close_cb), pw);
+ menu_item_add_icon(menu, _("C_lose window"), GQ_ICON_CLOSE, G_CALLBACK(pan_close_cb), pw);
return menu;
}
*-----------------------------------------------------------------------------
*/
-static void pan_window_get_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *context,
- gint UNUSED(x), gint UNUSED(y),
+static void pan_window_get_dnd_data(GtkWidget *, GdkDragContext *context,
+ gint, gint,
GtkSelectionData *selection_data, guint info,
- guint UNUSED(time), gpointer data)
+ guint, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
if (gtk_drag_get_source_widget(context) == pw->imd->pr) return;
GList *list;
list = uri_filelist_from_gtk_selection_data(selection_data);
- if (list && isdir(((FileData *)list->data)->path))
+ if (list && isdir((static_cast<FileData *>(list->data))->path))
{
- FileData *fd = list->data;
+ auto fd = static_cast<FileData *>(list->data);
pan_layout_set_fd(pw, fd);
}
}
}
-static void pan_window_set_dnd_data(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
- GtkSelectionData *selection_data, guint UNUSED(info),
- guint UNUSED(time), gpointer data)
+static void pan_window_set_dnd_data(GtkWidget *, GdkDragContext *,
+ GtkSelectionData *selection_data, guint,
+ guint, gpointer data)
{
- PanWindow *pw = (PanWindow *)data;
+ auto pw = static_cast<PanWindow *>(data);
FileData *fd;
fd = pan_menu_click_fd(pw);
{
GList *list;
- list = g_list_append(NULL, fd);
+ list = g_list_append(nullptr, fd);
uri_selection_data_set_uris_from_filelist(selection_data, list);
g_list_free(list);
}
else
{
gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
- 8, NULL, 0);
+ 8, nullptr, 0);
}
}
gtk_drag_source_set(widget, GDK_BUTTON2_MASK,
dnd_file_drag_types, dnd_file_drag_types_count,
- 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(widget), "drag_data_get",
G_CALLBACK(pan_window_set_dnd_data), pw);
gtk_drag_dest_set(widget,
- GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP,
+ static_cast<GtkDestDefaults>(GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_DROP),
dnd_file_drop_types, dnd_file_drop_types_count,
- 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(widget), "drag_data_received",
G_CALLBACK(pan_window_get_dnd_data), pw);
}
projects / geeqie.git / blobdiff