* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "main.h"
#include "search.h"
+#include <sys/types.h>
+
+#include <cmath>
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include "bar-keywords.h"
#include "cache.h"
#include "collect-table.h"
+#include "collect.h"
+#include "compat.h"
+#include "debug.h"
#include "dnd.h"
#include "dupe.h"
#include "editors.h"
#include "filedata.h"
#include "image-load.h"
#include "img-view.h"
+#include "intl.h"
#include "layout-util.h"
-#include "math.h"
+#include "layout.h"
+#include "main-defines.h"
#include "menu.h"
#include "metadata.h"
#include "misc.h"
-#include "pixbuf-util.h"
+#include "options.h"
#include "print.h"
+#include "similar.h"
#include "thumb.h"
+#include "typedefs.h"
#include "ui-bookmark.h"
#include "ui-fileops.h"
#include "ui-menu.h"
#include "ui-misc.h"
-#include "ui-spinner.h"
#include "ui-tabcomp.h"
#include "ui-tree-edit.h"
+#include "ui-utildlg.h"
#include "uri-utils.h"
#include "utilops.h"
#include "window.h"
-#include "bar-keywords.h"
-#define DEF_SEARCH_WIDTH 700
-#define DEF_SEARCH_HEIGHT 650
+enum {
+ DEF_SEARCH_WIDTH = 700,
+ DEF_SEARCH_HEIGHT = 650
+};
-#define SEARCH_BUFFER_MATCH_LOAD 20
-#define SEARCH_BUFFER_MATCH_HIT 5
-#define SEARCH_BUFFER_MATCH_MISS 1
-#define SEARCH_BUFFER_FLUSH_SIZE 99
+enum {
+ SEARCH_BUFFER_MATCH_LOAD = 20,
+ SEARCH_BUFFER_MATCH_HIT = 5,
+ SEARCH_BUFFER_MATCH_MISS = 1,
+ SEARCH_BUFFER_FLUSH_SIZE = 99
+};
-#define FORMAT_CLASS_BROKEN FILE_FORMAT_CLASSES + 1
+#define FORMAT_CLASS_BROKEN static_cast<FileFormatClass>(FILE_FORMAT_CLASSES + 1)
-typedef enum {
+enum MatchType {
SEARCH_MATCH_NONE,
SEARCH_MATCH_EQUAL,
SEARCH_MATCH_CONTAINS,
SEARCH_MATCH_ALL,
SEARCH_MATCH_ANY,
SEARCH_MATCH_COLLECTION
-} MatchType;
+};
enum {
SEARCH_COLUMN_POINTER = 0,
SEARCH_COLUMN_COUNT /* total columns */
};
-typedef struct _SearchData SearchData;
-struct _SearchData
+struct SearchData
{
GtkWidget *window;
gchar *search_name;
GRegex *search_name_regex;
gboolean search_name_match_case;
+ gboolean search_name_symbolic_link;
gint64 search_size;
gint64 search_size_end;
gint search_date_y;
};
-typedef struct _MatchFileData MatchFileData;
-struct _MatchFileData
+struct MatchFileData
{
FileData *fd;
gint width;
gint rank;
};
-typedef struct _MatchList MatchList;
-struct _MatchList
+struct MatchList
{
const gchar *text;
- const MatchType type;
+ MatchType type;
};
static const MatchList text_search_menu_path[] = {
{ N_("is not"), SEARCH_MATCH_NONE }
};
-static GList *search_window_list = NULL;
+static GList *search_window_list = nullptr;
static gint search_result_selection_count(SearchData *sd, gint64 *bytes);
* @link search_result_press_cb @endlink \n
* @link search_window_keypress_cb @endlink \n
* @link search_result_menu @endlink
- *
+ *
* See also @link hard_coded_window_keys @endlink
**/
{GDK_CONTROL_MASK, 'R', N_("Rename")},
{GDK_CONTROL_MASK, 'D', N_("Move to Trash")},
{GDK_SHIFT_MASK, GDK_KEY_Delete, N_("Delete")},
- {0, GDK_KEY_Delete, N_("Remove")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Delete, N_("Remove")},
{GDK_CONTROL_MASK, 'A', N_("Select all")},
- {GDK_CONTROL_MASK + GDK_SHIFT_MASK, 'A', N_("Select none")},
+ {static_cast<GdkModifierType>(GDK_CONTROL_MASK + GDK_SHIFT_MASK), 'A', N_("Select none")},
{GDK_CONTROL_MASK, GDK_KEY_Delete, N_("Clear")},
{GDK_CONTROL_MASK, 'T', N_("Toggle thumbs")},
{GDK_CONTROL_MASK, 'W', N_("Close window")},
- {0, GDK_KEY_Return, N_("View")},
- {0, 'V', N_("View in new window")},
- {0, 'C', N_("Collection from selection")},
+ {static_cast<GdkModifierType>(0), GDK_KEY_Return, N_("View")},
+ {static_cast<GdkModifierType>(0), 'V', N_("View in new window")},
+ {static_cast<GdkModifierType>(0), 'C', N_("Collection from selection")},
{GDK_CONTROL_MASK, GDK_KEY_Return, N_("Start/stop search")},
- {0, GDK_KEY_F3, N_("Find duplicates")},
- {0, 0, NULL}
+ {static_cast<GdkModifierType>(0), GDK_KEY_F3, N_("Find duplicates")},
+ {static_cast<GdkModifierType>(0), 0, nullptr}
};
/*
*-------------------------------------------------------------------
work = slist;
while (!found && work)
{
- GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
+ auto tpath = static_cast<GtkTreePath *>(work->data);
MatchFileData *mfd_n;
GtkTreeIter iter;
if (mfd_n->fd == fd) found = TRUE;
work = work->next;
}
- g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
- g_list_free(slist);
+ g_list_free_full(slist, reinterpret_cast<GDestroyNotify>(gtk_tree_path_free));
return found;
}
GList *work;
gint n = 0;
gint64 total = 0;
- GList *plist = NULL;
+ GList *plist = nullptr;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
if (bytes || list)
{
- GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
+ auto tpath = static_cast<GtkTreePath *>(work->data);
MatchFileData *mfd;
GtkTreeIter iter;
work = work->next;
}
- g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
- g_list_free(slist);
+ g_list_free_full(slist, reinterpret_cast<GDestroyNotify>(gtk_tree_path_free));
if (bytes) *bytes = total;
if (list) *list = g_list_reverse(plist);
{
GList *list;
- search_result_selection_util(sd, NULL, &list);
+ search_result_selection_util(sd, nullptr, &list);
return list;
}
static gint search_result_selection_count(SearchData *sd, gint64 *bytes)
{
- return search_result_selection_util(sd, bytes, NULL);
+ return search_result_selection_util(sd, bytes, nullptr);
}
static gint search_result_util(SearchData *sd, gint64 *bytes, GList **list)
gboolean valid;
gint n = 0;
gint64 total = 0;
- GList *plist = NULL;
+ GList *plist = nullptr;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
static GList *search_result_get_filelist(SearchData *sd)
{
- GList *list = NULL;
+ GList *list = nullptr;
- search_result_util(sd, NULL, &list);
+ search_result_util(sd, nullptr, &list);
return list;
}
static gint search_result_count(SearchData *sd, gint64 *bytes)
{
- return search_result_util(sd, bytes, NULL);
+ return search_result_util(sd, bytes, nullptr);
}
static void search_result_append(SearchData *sd, MatchFileData *mfd)
GtkListStore *store;
GtkTreeIter iter;
gchar *text_size;
- gchar *text_dim = NULL;
+ gchar *text_dim = nullptr;
fd = mfd->fd;
static GList *search_result_refine_list(SearchData *sd)
{
- GList *list = NULL;
+ GList *list = nullptr;
GtkTreeModel *store;
GtkTreeIter iter;
gboolean valid;
return g_list_reverse(list);
}
-static gboolean search_result_free_node(GtkTreeModel *store, GtkTreePath *UNUSED(tpath),
- GtkTreeIter *iter, gpointer UNUSED(data))
+static gboolean search_result_free_node(GtkTreeModel *store, GtkTreePath *, GtkTreeIter *iter, gpointer)
{
MatchFileData *mfd;
gtk_tree_model_foreach(GTK_TREE_MODEL(store), search_result_free_node, sd);
gtk_list_store_clear(store);
- sd->click_fd = NULL;
+ sd->click_fd = nullptr;
thumb_loader_free(sd->thumb_loader);
- sd->thumb_loader = NULL;
- sd->thumb_fd = NULL;
+ sd->thumb_loader = nullptr;
+ sd->thumb_fd = nullptr;
search_status_update(sd);
}
tree_view_move_cursor_away(GTK_TREE_VIEW(sd->result_view), iter, TRUE);
gtk_list_store_remove(GTK_LIST_STORE(store), iter);
- if (sd->click_fd == mfd->fd) sd->click_fd = NULL;
- if (sd->thumb_fd == mfd->fd) sd->thumb_fd = NULL;
+ if (sd->click_fd == mfd->fd) sd->click_fd = nullptr;
+ if (sd->thumb_fd == mfd->fd) sd->thumb_fd = nullptr;
file_data_unref(mfd->fd);
g_free(mfd);
}
GtkTreeSelection *selection;
GtkTreeModel *store;
GList *slist;
- GList *flist = NULL;
+ GList *flist = nullptr;
GList *work;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
work = slist;
while (work)
{
- GtkTreePath *tpath = static_cast<GtkTreePath *>(work->data);
+ auto tpath = static_cast<GtkTreePath *>(work->data);
GtkTreeIter iter;
MatchFileData *mfd;
flist = g_list_prepend(flist, mfd->fd);
work = work->next;
}
- g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
- g_list_free(slist);
+ g_list_free_full(slist, reinterpret_cast<GDestroyNotify>(gtk_tree_path_free));
work = flist;
while (work)
{
- FileData *fd = static_cast<FileData *>(work->data);
+ auto fd = static_cast<FileData *>(work->data);
work = work->next;
search_result_remove(sd, fd);
static void search_result_edit_selected(SearchData *sd, const gchar *key)
{
- file_util_start_editor_from_filelist(key, search_result_selection_list(sd), NULL, sd->window);
+ file_util_start_editor_from_filelist(key, search_result_selection_list(sd), nullptr, sd->window);
}
static void search_result_collection_from_selection(SearchData *sd)
GList *list;
list = search_result_selection_list(sd);
- w = collection_window_new(NULL);
+ w = collection_window_new(nullptr);
collection_table_add_filelist(w->table, list);
filelist_free(list);
}
static gboolean search_result_update_idle_cb(gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
search_status_update(sd);
sd->update_idle_id = 0;
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static void search_result_update_idle_cancel(SearchData *sd)
}
}
-static gboolean search_result_select_cb(GtkTreeSelection *UNUSED(selection), GtkTreeModel *UNUSED(store),
- GtkTreePath *UNUSED(tpath), gboolean UNUSED(selected), gpointer data)
+static gboolean search_result_select_cb(GtkTreeSelection *, GtkTreeModel *, GtkTreePath *, gboolean, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!sd->update_idle_id)
{
if (!sd->thumb_loader || !sd->thumb_fd) return;
fd = sd->thumb_fd;
- search_result_thumb_set(sd, fd, NULL);
+ search_result_thumb_set(sd, fd, nullptr);
}
-static void search_result_thumb_done_cb(ThumbLoader *UNUSED(tl), gpointer data)
+static void search_result_thumb_done_cb(ThumbLoader *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
search_result_thumb_do(sd);
search_result_thumb_step(sd);
{
GtkTreeModel *store;
GtkTreeIter iter;
- MatchFileData *mfd = NULL;
+ MatchFileData *mfd = nullptr;
gboolean valid;
gint row = 0;
gint length = 0;
{
if (!pixbuf) gtk_list_store_set(GTK_LIST_STORE(store), &iter, SEARCH_COLUMN_THUMB, mfd->fd->thumb_pixbuf, -1);
row++;
- mfd = NULL;
+ mfd = nullptr;
}
valid = gtk_tree_model_iter_next(store, &iter);
}
if (!mfd)
{
- sd->thumb_fd = NULL;
+ sd->thumb_fd = nullptr;
thumb_loader_free(sd->thumb_loader);
- sd->thumb_loader = NULL;
+ sd->thumb_loader = nullptr;
search_progress_update(sd, TRUE, -1.0);
return;
}
- search_progress_update(sd, FALSE, (gdouble)row/length);
+ search_progress_update(sd, FALSE, static_cast<gdouble>(row)/length);
sd->thumb_fd = mfd->fd;
thumb_loader_free(sd->thumb_loader);
thumb_loader_set_callbacks(sd->thumb_loader,
search_result_thumb_done_cb,
search_result_thumb_done_cb,
- NULL,
+ nullptr,
sd);
if (!thumb_loader_start(sd->thumb_loader, mfd->fd))
{
gboolean valid;
thumb_loader_free(sd->thumb_loader);
- sd->thumb_loader = NULL;
+ sd->thumb_loader = nullptr;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(sd->result_view));
valid = gtk_tree_model_get_iter_first(store, &iter);
*-------------------------------------------------------------------
*/
-static void sr_menu_view_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_view_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
- if (sd->click_fd) layout_set_fd(NULL, sd->click_fd);
+ if (sd->click_fd) layout_set_fd(nullptr, sd->click_fd);
}
-static void sr_menu_viewnew_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_viewnew_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
GList *list;
list = search_result_selection_list(sd);
filelist_free(list);
}
-static void sr_menu_select_all_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_select_all_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
gtk_tree_selection_select_all(selection);
}
-static void sr_menu_select_none_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_select_none_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
static void sr_menu_edit_cb(GtkWidget *widget, gpointer data)
{
SearchData *sd;
- const gchar *key = static_cast<const gchar *>(data);
+ auto key = static_cast<const gchar *>(data);
sd = static_cast<SearchData *>(submenu_item_get_data(widget));
if (!sd) return;
search_result_edit_selected(sd, key);
}
-static void sr_menu_print_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_print_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
print_window_new(sd->click_fd, search_result_selection_list(sd),
search_result_get_filelist(sd), sd->window);
}
-static void sr_menu_copy_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_copy_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
- file_util_copy(NULL, search_result_selection_list(sd), NULL, sd->window);
+ file_util_copy(nullptr, search_result_selection_list(sd), nullptr, sd->window);
}
-static void sr_menu_move_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_move_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
- file_util_move(NULL, search_result_selection_list(sd), NULL, sd->window);
+ file_util_move(nullptr, search_result_selection_list(sd), nullptr, sd->window);
}
-static void sr_menu_rename_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_rename_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
- file_util_rename(NULL, search_result_selection_list(sd), sd->window);
+ file_util_rename(nullptr, search_result_selection_list(sd), sd->window);
}
-static void sr_menu_delete_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_delete_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
options->file_ops.safe_delete_enable = FALSE;
- file_util_delete(NULL, search_result_selection_list(sd), sd->window);
+ file_util_delete(nullptr, search_result_selection_list(sd), sd->window);
}
-static void sr_menu_move_to_trash_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_move_to_trash_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
options->file_ops.safe_delete_enable = TRUE;
- file_util_delete(NULL, search_result_selection_list(sd), sd->window);
+ file_util_delete(nullptr, search_result_selection_list(sd), sd->window);
}
-static void sr_menu_copy_path_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_copy_path_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
file_util_copy_path_list_to_clipboard(search_result_selection_list(sd), TRUE);
}
-static void sr_menu_copy_path_unquoted_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_copy_path_unquoted_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
file_util_copy_path_list_to_clipboard(search_result_selection_list(sd), FALSE);
}
-static void sr_menu_play_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void sr_menu_play_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
start_editor_from_file(options->image_l_click_video_editor, sd->click_fd);
}
-static void search_result_menu_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void search_result_menu_destroy_cb(GtkWidget *, gpointer data)
{
- GList *editmenu_fd_list = static_cast<GList *>(data);
+ auto editmenu_fd_list = static_cast<GList *>(data);
filelist_free(editmenu_fd_list);
}
/**
* @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 search_pop_menu_collections_cb(GtkWidget *widget, gpointer data)
{
g_object_set_data(G_OBJECT(menu), "accel_group", accel_group);
video = (on_row && sd->click_fd && sd->click_fd->format_class == FORMAT_CLASS_VIDEO);
- menu_item_add_stock_sensitive(menu, _("_Play"), GTK_STOCK_MEDIA_PLAY, video,
+ menu_item_add_icon_sensitive(menu, _("_Play"), GQ_ICON_PREV_PAGE , video,
G_CALLBACK(sr_menu_play_cb), sd);
menu_item_add_divider(menu);
menu_item_add_sensitive(menu, _("_View"), on_row,
G_CALLBACK(sr_menu_view_cb), sd);
- menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row,
+ menu_item_add_icon_sensitive(menu, _("View in _new window"), GQ_ICON_NEW, on_row,
G_CALLBACK(sr_menu_viewnew_cb), sd);
menu_item_add_divider(menu);
menu_item_add_sensitive(menu, _("Select all"), !empty,
G_CALLBACK(search_pop_menu_collections_cb), sd);
gtk_widget_set_sensitive(item, on_row);
- menu_item_add_stock_sensitive(menu, _("Print..."), GTK_STOCK_PRINT, on_row,
+ menu_item_add_icon_sensitive(menu, _("Print..."), GQ_ICON_PRINT, on_row,
G_CALLBACK(sr_menu_print_cb), sd);
menu_item_add_divider(menu);
- menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, on_row,
+ menu_item_add_icon_sensitive(menu, _("_Copy..."), GQ_ICON_COPY, on_row,
G_CALLBACK(sr_menu_copy_cb), sd);
menu_item_add_sensitive(menu, _("_Move..."), on_row,
G_CALLBACK(sr_menu_move_cb), sd);
G_CALLBACK(sr_menu_copy_path_unquoted_cb), sd);
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, on_row,
+ _("Move to Trash"), GQ_ICON_DELETE, on_row,
G_CALLBACK(sr_menu_move_to_trash_cb), sd);
- menu_item_add_stock_sensitive(menu,
+ menu_item_add_icon_sensitive(menu,
options->file_ops.confirm_delete ? _("_Delete...") :
- _("_Delete"), GTK_STOCK_DELETE, on_row,
+ _("_Delete"), GQ_ICON_DELETE_SHRED, on_row,
G_CALLBACK(sr_menu_delete_cb), sd);
return menu;
static gboolean search_result_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
GtkTreeModel *store;
GtkTreePath *tpath;
GtkTreeIter iter;
- MatchFileData *mfd = NULL;
+ MatchFileData *mfd = nullptr;
store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
- &tpath, NULL, NULL, NULL))
+ &tpath, nullptr, nullptr, nullptr))
{
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, SEARCH_COLUMN_POINTER, &mfd, -1);
gtk_tree_path_free(tpath);
}
- sd->click_fd = mfd ? mfd->fd : NULL;
+ sd->click_fd = mfd ? mfd->fd : nullptr;
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
GtkWidget *menu;
- menu = search_result_menu(sd, (mfd != NULL), (search_result_count(sd, NULL) == 0));
- gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ menu = search_result_menu(sd, (mfd != nullptr), (search_result_count(sd, nullptr) == 0));
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), nullptr);
}
if (!mfd) return FALSE;
if (bevent->button == MOUSE_BUTTON_LEFT && bevent->type == GDK_2BUTTON_PRESS)
{
- layout_set_fd(NULL, mfd->fd);
+ layout_set_fd(nullptr, mfd->fd);
}
if (bevent->button == MOUSE_BUTTON_MIDDLE) return TRUE;
gtk_tree_selection_select_iter(selection, &iter);
tpath = gtk_tree_model_get_path(store, &iter);
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, NULL, FALSE);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, nullptr, FALSE);
gtk_tree_path_free(tpath);
}
return TRUE;
static gboolean search_result_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
GtkTreeModel *store;
GtkTreePath *tpath;
GtkTreeIter iter;
- MatchFileData *mfd = NULL;
+ MatchFileData *mfd = nullptr;
if (bevent->button != MOUSE_BUTTON_LEFT && bevent->button != MOUSE_BUTTON_MIDDLE) return TRUE;
if ((bevent->x != 0 || bevent->y != 0) &&
gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
- &tpath, NULL, NULL, NULL))
+ &tpath, nullptr, nullptr, nullptr))
{
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, SEARCH_COLUMN_POINTER, &mfd, -1);
gtk_tree_selection_select_iter(selection, &iter);
tpath = gtk_tree_model_get_path(store, &iter);
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, NULL, FALSE);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, nullptr, FALSE);
gtk_tree_path_free(tpath);
return TRUE;
static gboolean search_result_keypress_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
gboolean stop_signal = FALSE;
GtkTreeModel *store;
GtkTreeSelection *selection;
GList *slist;
- MatchFileData *mfd = NULL;
+ MatchFileData *mfd = nullptr;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
slist = gtk_tree_selection_get_selected_rows(selection, &store);
gtk_tree_model_get_iter(store, &iter, tpath);
gtk_tree_model_get(store, &iter, SEARCH_COLUMN_POINTER, &mfd, -1);
}
- g_list_foreach(slist, (GFunc)tree_path_free_wrapper, NULL);
- g_list_free(slist);
+ g_list_free_full(slist, reinterpret_cast<GDestroyNotify>(gtk_tree_path_free));
if (event->state & GDK_CONTROL_MASK)
{
case '0':
break;
case 'C': case 'c':
- file_util_copy(NULL, search_result_selection_list(sd), NULL, widget);
+ file_util_copy(nullptr, search_result_selection_list(sd), nullptr, widget);
break;
case 'M': case 'm':
- file_util_move(NULL, search_result_selection_list(sd), NULL, widget);
+ file_util_move(nullptr, search_result_selection_list(sd), nullptr, widget);
break;
case 'R': case 'r':
- file_util_rename(NULL, search_result_selection_list(sd), widget);
+ file_util_rename(nullptr, search_result_selection_list(sd), widget);
break;
case 'D': case 'd':
options->file_ops.safe_delete_enable = TRUE;
- file_util_delete(NULL, search_result_selection_list(sd), widget);
+ file_util_delete(nullptr, search_result_selection_list(sd), widget);
break;
case 'A': case 'a':
if (event->state & GDK_SHIFT_MASK)
switch (event->keyval)
{
case GDK_KEY_Return: case GDK_KEY_KP_Enter:
- if (mfd) layout_set_fd(NULL, mfd->fd);
+ if (mfd) layout_set_fd(nullptr, mfd->fd);
break;
case 'V': case 'v':
{
if (mfd)
sd->click_fd = mfd->fd;
else
- sd->click_fd = NULL;
+ sd->click_fd = nullptr;
- menu = search_result_menu(sd, (mfd != NULL), (search_result_count(sd, NULL) > 0));
+ menu = search_result_menu(sd, (mfd != nullptr), (search_result_count(sd, nullptr) > 0));
- gtk_menu_popup_at_widget(GTK_MENU(menu), widget, GDK_GRAVITY_EAST, GDK_GRAVITY_CENTER, NULL);
+ gtk_menu_popup_at_widget(GTK_MENU(menu), widget, GDK_GRAVITY_EAST, GDK_GRAVITY_CENTER, nullptr);
}
break;
default:
return stop_signal;
}
-static gboolean search_window_keypress_cb(GtkWidget *UNUSED(widget), GdkEventKey *event, gpointer data)
+static gboolean search_window_keypress_cb(GtkWidget *, GdkEventKey *event, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
gboolean stop_signal = FALSE;
if (event->state & GDK_CONTROL_MASK)
search_window_close(sd);
break;
case GDK_KEY_Return: case GDK_KEY_KP_Enter:
- search_start_cb(NULL, sd);
+ search_start_cb(nullptr, sd);
break;
default:
stop_signal = FALSE;
*/
static GtkTargetEntry result_drag_types[] = {
- { "text/uri-list", 0, TARGET_URI_LIST },
- { "text/plain", 0, TARGET_TEXT_PLAIN }
+ { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+ { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
};
static gint n_result_drag_types = 2;
static GtkTargetEntry result_drop_types[] = {
- { "text/uri-list", 0, TARGET_URI_LIST },
- { "text/plain", 0, TARGET_TEXT_PLAIN }
+ { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+ { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
};
static gint n_result_drop_types = 2;
-static void search_dnd_data_set(GtkWidget *UNUSED(widget), GdkDragContext *UNUSED(context),
- GtkSelectionData *selection_data, guint UNUSED(info),
- guint UNUSED(time), gpointer data)
+static void search_dnd_data_set(GtkWidget *, GdkDragContext *,
+ GtkSelectionData *selection_data, guint,
+ guint, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
GList *list;
list = search_result_selection_list(sd);
static void search_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (sd->click_fd && !search_result_row_selected(sd, sd->click_fd))
{
gtk_tree_selection_select_iter(selection, &iter);
tpath = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
- gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, NULL, FALSE);
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(widget), tpath, nullptr, FALSE);
gtk_tree_path_free(tpath);
}
}
if (sd->thumb_enable &&
sd->click_fd && sd->click_fd->thumb_pixbuf)
{
- dnd_set_drag_icon(widget, context, sd->click_fd->thumb_pixbuf, search_result_selection_count(sd, NULL));
+ dnd_set_drag_icon(widget, context, sd->click_fd->thumb_pixbuf, search_result_selection_count(sd, nullptr));
}
}
-static void search_gps_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDragContext *UNUSED(context),
- gint UNUSED(x), gint UNUSED(y),
+static void search_gps_dnd_received_cb(GtkWidget *, GdkDragContext *,
+ gint, gint,
GtkSelectionData *selection_data, guint info,
- guint UNUSED(time), gpointer data)
+ guint, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
GList *list;
- gdouble latitude, longitude;
+ gdouble latitude;
+ gdouble longitude;
FileData *fd;
if (info == TARGET_URI_LIST)
/* If more than one file, use only the first file in a list.
*/
- if (list != NULL)
+ if (list != nullptr)
{
fd = static_cast<FileData *>(list->data);
latitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLatitude", 1000);
longitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLongitude", 1000);
if (latitude != 1000 && longitude != 1000)
{
- gtk_entry_set_text(GTK_ENTRY(sd->entry_gps_coord),
+ gq_gtk_entry_set_text(GTK_ENTRY(sd->entry_gps_coord),
g_strdup_printf("%lf %lf", latitude, longitude));
}
else
{
- gtk_entry_set_text(GTK_ENTRY(sd->entry_gps_coord), "Image is not geocoded");
+ gq_gtk_entry_set_text(GTK_ENTRY(sd->entry_gps_coord), _("Image is not geocoded"));
}
}
}
if (info == TARGET_TEXT_PLAIN)
{
- gtk_entry_set_text(GTK_ENTRY(sd->entry_gps_coord),"");
+ gq_gtk_entry_set_text(GTK_ENTRY(sd->entry_gps_coord),"");
}
}
-static void search_path_entry_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDragContext *UNUSED(context),
- gint UNUSED(x), gint UNUSED(y),
+static void search_path_entry_dnd_received_cb(GtkWidget *, GdkDragContext *,
+ gint, gint,
GtkSelectionData *selection_data, guint info,
- guint UNUSED(time), gpointer data)
+ guint, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
GList *list;
FileData *fd;
list = uri_filelist_from_gtk_selection_data(selection_data);
/* If more than one file, use only the first file in a list.
*/
- if (list != NULL)
+ if (list != nullptr)
{
fd = static_cast<FileData *>(list->data);
- gtk_entry_set_text(GTK_ENTRY(sd->path_entry),
+ gq_gtk_entry_set_text(GTK_ENTRY(sd->path_entry),
g_strdup_printf("%s", fd->path));
gtk_widget_set_tooltip_text(GTK_WIDGET(sd->path_entry),g_strdup_printf("%s", fd->path));
}
if (info == TARGET_TEXT_PLAIN)
{
- gtk_entry_set_text(GTK_ENTRY(sd->path_entry),"");
+ gq_gtk_entry_set_text(GTK_ENTRY(sd->path_entry),"");
}
}
-static void search_image_content_dnd_received_cb(GtkWidget *UNUSED(pane), GdkDragContext *UNUSED(context),
- gint UNUSED(x), gint UNUSED(y),
+static void search_image_content_dnd_received_cb(GtkWidget *, GdkDragContext *,
+ gint, gint,
GtkSelectionData *selection_data, guint info,
- guint UNUSED(time), gpointer data)
+ guint, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
GList *list;
FileData *fd;
list = uri_filelist_from_gtk_selection_data(selection_data);
/* If more than one file, use only the first file in a list.
*/
- if (list != NULL)
+ if (list != nullptr)
{
fd = static_cast<FileData *>(list->data);
- gtk_entry_set_text(GTK_ENTRY(sd->entry_similarity),
+ gq_gtk_entry_set_text(GTK_ENTRY(sd->entry_similarity),
g_strdup_printf("%s", fd->path));
gtk_widget_set_tooltip_text(GTK_WIDGET(sd->entry_similarity),g_strdup_printf("%s", fd->path));
}
if (info == TARGET_TEXT_PLAIN)
{
- gtk_entry_set_text(GTK_ENTRY(sd->entry_similarity),"");
+ gq_gtk_entry_set_text(GTK_ENTRY(sd->entry_similarity),"");
}
}
static void search_dnd_init(SearchData *sd)
{
- gtk_drag_source_set(sd->result_view, GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+ gtk_drag_source_set(sd->result_view, static_cast<GdkModifierType>(GDK_BUTTON1_MASK | GDK_BUTTON2_MASK),
result_drag_types, n_result_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(sd->result_view), "drag_data_get",
G_CALLBACK(search_dnd_data_set), sd);
g_signal_connect(G_OBJECT(sd->result_view), "drag_begin",
*-------------------------------------------------------------------
*/
-#define MATCH_IS_BETWEEN(val, a, b) (b > a ? (val >= a && val <= b) : (val >= b && val <= a))
+#define MATCH_IS_BETWEEN(val, a, b) ((b) > (a) ? ((val) >= (a) && (val) <= (b)) : ((val) >= (b) && (val) <= (a)))
static gboolean search_step_cb(gpointer data);
work = g_list_last(sd->search_buffer_list);
while (work)
{
- MatchFileData *mfd = static_cast<MatchFileData *>(work->data);
+ auto mfd = static_cast<MatchFileData *>(work->data);
work = work->prev;
search_result_append(sd, mfd);
}
g_list_free(sd->search_buffer_list);
- sd->search_buffer_list = NULL;
+ sd->search_buffer_list = nullptr;
sd->search_buffer_count = 0;
}
}
image_loader_free(sd->img_loader);
- sd->img_loader = NULL;
+ sd->img_loader = nullptr;
cache_sim_data_free(sd->img_cd);
- sd->img_cd = NULL;
+ sd->img_cd = nullptr;
cache_sim_data_free(sd->search_similarity_cd);
- sd->search_similarity_cd = NULL;
+ sd->search_similarity_cd = nullptr;
search_buffer_flush(sd);
filelist_free(sd->search_folder_list);
- sd->search_folder_list = NULL;
+ sd->search_folder_list = nullptr;
g_list_free(sd->search_done_list);
- sd->search_done_list = NULL;
+ sd->search_done_list = nullptr;
filelist_free(sd->search_file_list);
- sd->search_file_list = NULL;
+ sd->search_file_list = nullptr;
sd->match_broken_enable = FALSE;
gtk_widget_set_sensitive(sd->box_search, TRUE);
- spinner_set_interval(sd->spinner, -1);
+ gtk_spinner_stop(GTK_SPINNER(sd->spinner));
gtk_widget_set_sensitive(sd->button_start, TRUE);
gtk_widget_set_sensitive(sd->button_stop, FALSE);
search_progress_update(sd, TRUE, -1.0);
if (recursive_mkdir_if_not_exists(base, mode))
{
g_free(cd->path);
- cd->path = cache_get_location(CACHE_TYPE_SIM, path, TRUE, NULL);
+ cd->path = cache_get_location(CACHE_TYPE_SIM, path, TRUE, nullptr);
if (cache_sim_data_save(cd))
{
filetime_set(cd->path, filetime(image_loader_get_fd(sd->img_loader)->path));
}
image_loader_free(sd->img_loader);
- sd->img_loader = NULL;
+ sd->img_loader = nullptr;
sd->search_idle_id = g_idle_add(search_step_cb, sd);
}
-static void search_file_load_done_cb(ImageLoader *UNUSED(il), gpointer data)
+static void search_file_load_done_cb(ImageLoader *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
search_file_load_process(sd, sd->img_cd);
}
{
return TRUE;
}
- else
- {
- image_loader_free(sd->img_loader);
- sd->img_loader = NULL;
- }
+
+ image_loader_free(sd->img_loader);
+ sd->img_loader = nullptr;
}
}
gdouble result;
result = image_sim_compare_fast(sd->search_similarity_cd->sim, sd->img_cd->sim,
- (gdouble)sd->search_similarity / 100.0);
+ static_cast<gdouble>(sd->search_similarity) / 100.0);
result *= 100.0;
- if (result >= (gdouble)sd->search_similarity)
+ if (result >= static_cast<gdouble>(sd->search_similarity))
{
tmatch = TRUE;
- value = (gint)result;
+ value = static_cast<gint>(result);
}
}
}
cache_sim_data_free(sd->img_cd);
- sd->img_cd = NULL;
+ sd->img_cd = nullptr;
*match = (tmatch && tested);
tested = TRUE;
match = FALSE;
- if (sd->match_name == SEARCH_MATCH_NAME_EQUAL)
+ if (!sd->search_name_symbolic_link || (sd->search_name_symbolic_link && islink(fd->path)))
{
- if (sd->search_name_match_case)
+ if (sd->match_name == SEARCH_MATCH_NAME_EQUAL)
{
- match = (strcmp(fd->name, sd->search_name) == 0);
- }
- else
- {
- match = (g_ascii_strcasecmp(fd->name, sd->search_name) == 0);
- }
- }
- else if (sd->match_name == SEARCH_MATCH_NAME_CONTAINS || sd->match_name == SEARCH_MATCH_PATH_CONTAINS)
- {
- const gchar *fd_name_or_path;
- if (sd->match_name == SEARCH_MATCH_NAME_CONTAINS)
- {
- fd_name_or_path = fd->name;
- }
- else
- {
- fd_name_or_path = fd->path;
- }
- if (sd->search_name_match_case)
- {
- match = g_regex_match(sd->search_name_regex, fd_name_or_path, 0, NULL);
+ if (sd->search_name_match_case)
+ {
+ match = (strcmp(fd->name, sd->search_name) == 0);
+ }
+ else
+ {
+ match = (g_ascii_strcasecmp(fd->name, sd->search_name) == 0);
+ }
}
- else
+ else if (sd->match_name == SEARCH_MATCH_NAME_CONTAINS || sd->match_name == SEARCH_MATCH_PATH_CONTAINS)
{
- /* sd->search_name is converted in search_start() */
- gchar *haystack = g_utf8_strdown(fd_name_or_path, -1);
- match = g_regex_match(sd->search_name_regex, haystack, 0, NULL);
- g_free(haystack);
+ const gchar *fd_name_or_path;
+ if (sd->match_name == SEARCH_MATCH_NAME_CONTAINS)
+ {
+ fd_name_or_path = fd->name;
+ }
+ else
+ {
+ fd_name_or_path = fd->path;
+ }
+ if (sd->search_name_match_case)
+ {
+ match = g_regex_match(sd->search_name_regex, fd_name_or_path, static_cast<GRegexMatchFlags>(0), nullptr);
+ }
+ else
+ {
+ /* sd->search_name is converted in search_start() */
+ gchar *haystack = g_utf8_strdown(fd_name_or_path, -1);
+ match = g_regex_match(sd->search_name_regex, haystack, static_cast<GRegexMatchFlags>(0), nullptr);
+ g_free(haystack);
+ }
}
}
}
haystack = list;
while (haystack && !found)
{
- found = (g_ascii_strcasecmp((gchar *)needle->data,
- (gchar *)haystack->data) == 0);
+ found = (g_ascii_strcasecmp(static_cast<gchar *>(needle->data),
+ static_cast<gchar *>(haystack->data)) == 0);
haystack = haystack->next;
}
needle = needle->next;
haystack = list;
while (haystack && !found)
{
- found = (g_ascii_strcasecmp((gchar *)needle->data,
- (gchar *)haystack->data) == 0);
+ found = (g_ascii_strcasecmp(static_cast<gchar *>(needle->data),
+ static_cast<gchar *>(haystack->data)) == 0);
haystack = haystack->next;
}
needle = needle->next;
haystack = list;
while (haystack && !found)
{
- found = (g_ascii_strcasecmp((gchar *)needle->data,
- (gchar *)haystack->data) == 0);
+ found = (g_ascii_strcasecmp(static_cast<gchar *>(needle->data),
+ static_cast<gchar *>(haystack->data)) == 0);
haystack = haystack->next;
}
needle = needle->next;
match = !found;
}
- string_list_free(list);
+ g_list_free_full(list, g_free);
}
else
{
if (sd->match_comment == SEARCH_MATCH_CONTAINS)
{
- match = g_regex_match(sd->search_comment_regex, comment, 0, NULL);
+ match = g_regex_match(sd->search_comment_regex, comment, static_cast<GRegexMatchFlags>(0), nullptr);
}
else if (sd->match_comment == SEARCH_MATCH_NONE)
{
- match = !g_regex_match(sd->search_comment_regex, comment, 0, NULL);
+ match = !g_regex_match(sd->search_comment_regex, comment, static_cast<GRegexMatchFlags>(0), nullptr);
}
g_free(comment);
}
match = FALSE;
gint search_marks = -1;
gint i = 0;
- gchar *marks_string = NULL;
+ gchar *marks_string = nullptr;
if (g_strcmp0(gtk_combo_box_text_get_active_text(
GTK_COMBO_BOX_TEXT(sd->marks_type)), _("Any mark")) == 0)
search_marks = 1 << i;
}
g_free(marks_string);
- marks_string = NULL;
+ marks_string = nullptr;
}
}
#define MILES_EARTH_RADIUS 3959
#define NAUTICAL_MILES_EARTH_RADIUS 3440
- gdouble latitude, longitude, range, conversion;
+ gdouble latitude;
+ gdouble longitude;
+ gdouble range;
+ gdouble conversion;
if (g_strcmp0(gtk_combo_box_text_get_active_text(
GTK_COMBO_BOX_TEXT(sd->units_gps)), _("km")) == 0)
if (tested && match)
{
- MatchFileData *mfd;
-
- mfd = g_new(MatchFileData, 1);
+ auto mfd = g_new(MatchFileData, 1);
mfd->fd = fd;
mfd->width = width;
static gboolean search_step_cb(gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
FileData *fd;
if (sd->search_buffer_count > SEARCH_BUFFER_FLUSH_SIZE)
if (search_file_next(sd))
{
sd->search_idle_id = 0;
- return FALSE;
+ return G_SOURCE_REMOVE;
}
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
if (!sd->search_file_list && !sd->search_folder_list)
search_stop(sd);
search_result_thumb_step(sd);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
fd = static_cast<FileData *>(sd->search_folder_list->data);
- if (g_list_find(sd->search_done_list, fd) == NULL)
+ if (g_list_find(sd->search_done_list, fd) == nullptr)
{
- GList *list = NULL;
- GList *dlist = NULL;
+ GList *list = nullptr;
+ GList *dlist = nullptr;
gboolean success = FALSE;
sd->search_done_list = g_list_prepend(sd->search_done_list, fd);
if (path != fd->path)
{
FileData *dir_fd = file_data_new_dir(path);
- success = filelist_read(dir_fd, &list, NULL);
+ success = filelist_read(dir_fd, &list, nullptr);
file_data_unref(dir_fd);
}
- success |= filelist_read(fd, NULL, &dlist);
+ success |= filelist_read(fd, nullptr, &dlist);
if (success)
{
GList *work;
if (success)
{
- list = filelist_sort(list, SORT_NAME, TRUE);
+ list = filelist_sort(list, SORT_NAME, TRUE, TRUE);
sd->search_file_list = list;
if (sd->search_path_recurse)
{
- dlist = filelist_sort(dlist, SORT_NAME, TRUE);
+ dlist = filelist_sort(dlist, SORT_NAME, TRUE, TRUE);
sd->search_folder_list = g_list_concat(dlist, sd->search_folder_list);
}
else
file_data_unref(fd);
}
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
-static void search_similarity_load_done_cb(ImageLoader *UNUSED(il), gpointer data)
+static void search_similarity_load_done_cb(ImageLoader *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
search_file_load_process(sd, sd->search_similarity_cd);
}
static void search_start(SearchData *sd)
{
- GError *error = NULL;
+ GError *error = nullptr;
search_stop(sd);
search_result_clear(sd);
g_regex_unref(sd->search_name_regex);
}
- sd->search_name_regex = g_regex_new(sd->search_name, 0, 0, &error);
+ sd->search_name_regex = g_regex_new(sd->search_name, static_cast<GRegexCompileFlags>(0), static_cast<GRegexMatchFlags>(0), &error);
if (error)
{
log_printf("Error: could not compile regular expression %s\n%s\n", sd->search_name, error->message);
g_error_free(error);
- error = NULL;
- sd->search_name_regex = g_regex_new("", 0, 0, NULL);
+ error = nullptr;
+ sd->search_name_regex = g_regex_new("", static_cast<GRegexCompileFlags>(0), static_cast<GRegexMatchFlags>(0), nullptr);
}
if (!sd->search_comment_match_case)
g_regex_unref(sd->search_comment_regex);
}
- sd->search_comment_regex = g_regex_new(sd->search_comment, 0, 0, &error);
+ sd->search_comment_regex = g_regex_new(sd->search_comment, static_cast<GRegexCompileFlags>(0), static_cast<GRegexMatchFlags>(0), &error);
if (error)
{
log_printf("Error: could not compile regular expression %s\n%s\n", sd->search_comment, error->message);
g_error_free(error);
- error = NULL;
- sd->search_comment_regex = g_regex_new("", 0, 0, NULL);
+ error = nullptr;
+ sd->search_comment_regex = g_regex_new("", static_cast<GRegexCompileFlags>(0), static_cast<GRegexMatchFlags>(0), nullptr);
}
sd->search_count = 0;
sd->search_total = 0;
gtk_widget_set_sensitive(sd->box_search, FALSE);
- spinner_set_interval(sd->spinner, SPINNER_SPEED);
+ gtk_spinner_start(GTK_SPINNER(sd->spinner));
gtk_widget_set_sensitive(sd->button_start, FALSE);
gtk_widget_set_sensitive(sd->button_stop, TRUE);
search_progress_update(sd, TRUE, -1.0);
return;
}
image_loader_free(sd->img_loader);
- sd->img_loader = NULL;
+ sd->img_loader = nullptr;
}
}
sd->search_idle_id = g_idle_add(search_step_cb, sd);
}
-static void search_start_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void search_start_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
- GtkTreeViewColumn *column;
- gchar *path;
- gchar *entry_text;
+ auto sd = static_cast<SearchData *>(data);
gchar *collection;
+ gchar *entry_text;
+ gchar *path;
+ GDateTime *date;
+ GtkTreeViewColumn *column;
if (sd->search_folder_list)
{
return;
}
- if (sd->match_name_enable) history_combo_append_history(sd->entry_name, NULL);
+ if (sd->match_name_enable) history_combo_append_history(sd->entry_name, nullptr);
g_free(sd->search_name);
- sd->search_name = g_strdup(gtk_entry_get_text(GTK_ENTRY(sd->entry_name)));
+ sd->search_name = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(sd->entry_name)));
/* XXX */
g_free(sd->search_comment);
- sd->search_comment = g_strdup(gtk_entry_get_text(GTK_ENTRY(sd->entry_comment)));
+ sd->search_comment = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(sd->entry_comment)));
g_free(sd->search_similarity_path);
- sd->search_similarity_path = g_strdup(gtk_entry_get_text(GTK_ENTRY(sd->entry_similarity)));
+ sd->search_similarity_path = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(sd->entry_similarity)));
if (sd->match_similarity_enable)
{
if (!isfile(sd->search_similarity_path))
{
file_util_warning_dialog(_("File not found"),
_("Please enter an existing file for image content."),
- GTK_STOCK_DIALOG_WARNING, sd->window);
+ GQ_ICON_DIALOG_WARNING, sd->window);
return;
}
tab_completion_append_to_history(sd->entry_similarity, sd->search_similarity_path);
{
if (sd->match_gps != SEARCH_MATCH_NONE)
{
- entry_text = decode_geo_parameters(gtk_entry_get_text(
+ entry_text = decode_geo_parameters(gq_gtk_entry_get_text(
GTK_ENTRY(sd->entry_gps_coord)));
sd->search_lat = 1000;
sd->search_lon = 1000;
sscanf(entry_text," %lf %lf ", &sd->search_lat, &sd->search_lon );
- if (!(entry_text != NULL && !g_strstr_len(entry_text, -1, "Error") &&
- sd->search_lat >= -90 && sd->search_lat <= 90 &&
- sd->search_lon >= -180 && sd->search_lon <= 180))
+ if (entry_text == nullptr || g_strstr_len(entry_text, -1, "Error") ||
+ sd->search_lat < -90 || sd->search_lat > 90 ||
+ sd->search_lon < -180 || sd->search_lon > 180)
{
file_util_warning_dialog(_(
"Entry does not contain a valid lat/long value"),
- entry_text, GTK_STOCK_DIALOG_WARNING, sd->window);
+ entry_text, GQ_ICON_DIALOG_WARNING, sd->window);
return;
}
g_free(entry_text);
}
}
- string_list_free(sd->search_keyword_list);
+ g_list_free_full(sd->search_keyword_list, g_free);
sd->search_keyword_list = keyword_list_pull(sd->entry_keywords);
- date_selection_get(sd->date_sel, &sd->search_date_d, &sd->search_date_m, &sd->search_date_y);
- date_selection_get(sd->date_sel_end, &sd->search_date_end_d, &sd->search_date_end_m, &sd->search_date_end_y);
+ date = date_selection_get(sd->date_sel);
+ sd->search_date_d = g_date_time_get_day_of_month(date);
+ sd->search_date_m = g_date_time_get_month(date);
+ sd->search_date_y = g_date_time_get_year(date);
+ g_date_time_unref(date);
+
+ date = date_selection_get(sd->date_sel_end);
+ sd->search_date_end_d = g_date_time_get_day_of_month(date);
+ sd->search_date_end_m = g_date_time_get_month(date);
+ sd->search_date_end_y = g_date_time_get_year(date);
+ g_date_time_unref(date);
column = gtk_tree_view_get_column(GTK_TREE_VIEW(sd->result_view), SEARCH_COLUMN_DIMENSIONS - 1);
gtk_tree_view_column_set_visible(column, sd->match_dimensions_enable);
{
/* search path */
- path = remove_trailing_slash(gtk_entry_get_text(GTK_ENTRY(sd->path_entry)));
+ path = remove_trailing_slash(gq_gtk_entry_get_text(GTK_ENTRY(sd->path_entry)));
if (isdir(path))
{
file_data_unref(sd->search_dir_fd);
{
file_util_warning_dialog(_("Folder not found"),
_("Please enter an existing folder to search."),
- GTK_STOCK_DIALOG_WARNING, sd->window);
+ GQ_ICON_DIALOG_WARNING, sd->window);
}
g_free(path);
list = search_result_refine_list(sd);
file_data_unref(sd->search_dir_fd);
- sd->search_dir_fd = NULL;
+ sd->search_dir_fd = nullptr;
search_start(sd);
}
else if (sd->search_type == SEARCH_MATCH_COLLECTION)
{
- collection = g_strdup(gtk_entry_get_text(GTK_ENTRY(sd->collection_entry)));
+ collection = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(sd->collection_entry)));
if (is_collection(collection))
{
- GList *list = NULL;
+ GList *list = nullptr;
list = collection_contents_fd(collection);
file_data_unref(sd->search_dir_fd);
- sd->search_dir_fd = NULL;
+ sd->search_dir_fd = nullptr;
search_start(sd);
}
else
{
- file_util_warning_dialog(_("Collection not found"), _("Please enter an existing collection name."), GTK_STOCK_DIALOG_WARNING, sd->window);
+ file_util_warning_dialog(_("Collection not found"), _("Please enter an existing collection name."), GQ_ICON_DIALOG_WARNING, sd->window);
}
g_free(collection);
}
static void search_thumb_toggle_cb(GtkWidget *button, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
search_result_thumb_enable(sd, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
}
switch (n)
{
case SEARCH_COLUMN_RANK:
- if (((MatchFileData *)fda)->rank > (fdb)->rank) return 1;
- if (((MatchFileData *)fda)->rank < (fdb)->rank) return -1;
+ if ((fda)->rank > (fdb)->rank) return 1;
+ if ((fda)->rank < (fdb)->rank) return -1;
return 0;
break;
case SEARCH_COLUMN_NAME:
return sort_matchdata_dimensions(fda, fdb);
break;
case SEARCH_COLUMN_PATH:
- return utf8_compare(fda->fd->path, fdb->fd->path, options->file_sort.case_sensitive);
+ return utf8_compare(fda->fd->path, fdb->fd->path, TRUE);
break;
default:
break;
static void menu_choice_path_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->search_type)) return;
static void menu_choice_name_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->match_name)) return;
}
static void menu_choice_size_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->match_size)) return;
static void menu_choice_rating_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->match_rating)) return;
static void menu_choice_class_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->match_class)) return;
}
static void menu_choice_marks_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->match_marks)) return;
}
static void menu_choice_date_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->match_date)) return;
static void menu_choice_dimensions_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->match_dimensions)) return;
static void menu_choice_keyword_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->match_keywords)) return;
}
static void menu_choice_comment_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->match_comment)) return;
}
static void menu_choice_spin_cb(GtkAdjustment *adjustment, gpointer data)
{
- gint *value = static_cast<gint *>(data);
+ auto value = static_cast<gint *>(data);
- *value = (gint)gtk_adjustment_get_value(adjustment);
+ *value = static_cast<gint>(gtk_adjustment_get_value(adjustment));
}
static void menu_choice_gps_cb(GtkWidget *combo, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!menu_choice_get_match_type(combo, &sd->match_gps)) return;
GtkAdjustment *adj;
spin = gtk_spin_button_new_with_range(min, max, 1);
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), (gdouble)value);
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), static_cast<gdouble>(value));
adj = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(spin));
if (func) g_signal_connect(G_OBJECT(adj), "value_changed",
G_CALLBACK(func), data);
- gtk_box_pack_start(GTK_BOX(box), spin, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(box), spin, FALSE, FALSE, 0);
gtk_widget_show(spin);
return spin;
static void menu_choice_check_cb(GtkWidget *button, gpointer data)
{
- GtkWidget *widget = static_cast<GtkWidget *>(data);
+ auto widget = static_cast<GtkWidget *>(data);
gboolean active;
gboolean *value;
GtkWidget *option;
base_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP);
- gtk_box_pack_start(GTK_BOX(box), base_box, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(box), base_box, FALSE, FALSE, 0);
gtk_widget_show(base_box);
button = gtk_check_button_new();
if (value) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), *value);
- gtk_box_pack_start(GTK_BOX(base_box), button, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(base_box), button, FALSE, FALSE, 0);
gtk_widget_show(button);
if (check) *check = button;
if (value) g_object_set_data(G_OBJECT(button), "check_var", value);
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
- gtk_box_pack_start(GTK_BOX(base_box), hbox, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(base_box), hbox, TRUE, TRUE, 0);
gtk_widget_show(hbox);
g_signal_connect(G_OBJECT(button), "toggled",
if (!items && !menu) return hbox;
option = menu_choice_menu(items, item_count, func, data);
- gtk_box_pack_start(GTK_BOX(hbox), option, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), option, FALSE, FALSE, 0);
gtk_widget_show(option);
if (menu) *menu = option;
static void search_window_get_geometry(SearchData *sd)
{
GdkWindow *window;
- LayoutWindow *lw = NULL;
+ LayoutWindow *lw = nullptr;
layout_valid(&lw);
search_window_get_geometry(sd);
- gtk_widget_destroy(sd->window);
+ gq_gtk_widget_destroy(sd->window);
}
-static void search_window_close_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void search_window_close_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
search_window_close(sd);
}
-static void search_window_help_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
+static void search_window_help_cb(GtkWidget *, gpointer)
{
help_window_show("GuideImageSearchSearch.html");
}
-static gboolean search_window_delete_cb(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer data)
+static gboolean search_window_delete_cb(GtkWidget *, GdkEventAny *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
search_window_close(sd);
return TRUE;
}
-static void search_window_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void search_window_destroy_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
search_window_list = g_list_remove(search_window_list, sd);
search_result_update_idle_cancel(sd);
mfd_list_free(sd->search_buffer_list);
- sd->search_buffer_list = NULL;
+ sd->search_buffer_list = nullptr;
search_stop(sd);
search_result_clear(sd);
g_regex_unref(sd->search_comment_regex);
}
g_free(sd->search_similarity_path);
- string_list_free(sd->search_keyword_list);
+ g_list_free_full(sd->search_keyword_list, g_free);
file_data_unregister_notify_func(search_notify_cb, sd);
g_free(sd);
}
-static void select_collection_dialog_close_cb(FileDialog *fdlg, gpointer UNUSED(data))
+static void select_collection_dialog_close_cb(FileDialog *fdlg, gpointer)
{
file_dialog_close(fdlg);
}
static void select_collection_dialog_ok_cb(FileDialog *fdlg, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
gchar *path;
gchar *path_noext;
gchar *collection;
- path = g_strdup(gtk_entry_get_text(GTK_ENTRY(fdlg->entry)));
+ path = g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(fdlg->entry)));
path_noext = remove_extension_from_path(path);
collection = g_path_get_basename(path_noext);
- gtk_entry_set_text(GTK_ENTRY(sd->collection_entry), collection);
+ gq_gtk_entry_set_text(GTK_ENTRY(sd->collection_entry), collection);
file_dialog_close(fdlg);
g_free(path);
g_free(collection);
}
-static void select_collection_clicked_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void select_collection_clicked_cb(GtkWidget *, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
FileDialog *fdlg;
const gchar *title;
const gchar *btntext;
gpointer btnfunc;
- const gchar *stock_id;
+ const gchar *icon_name;
title = _("Select collection");
- btntext = NULL;
- btnfunc = (void *)select_collection_dialog_ok_cb;
- stock_id = GTK_STOCK_OK;
+ btntext = nullptr;
+ btnfunc = reinterpret_cast<void *>(select_collection_dialog_ok_cb);
+ icon_name = GQ_ICON_OK;
fdlg = file_util_file_dlg(title, "dlg_collection", sd->window, select_collection_dialog_close_cb, sd);
- generic_dialog_add_message(GENERIC_DIALOG(fdlg), NULL, title, NULL, FALSE);
- file_dialog_add_button(fdlg, stock_id, btntext, (void(*)(FileDialog *, gpointer))btnfunc, TRUE);
+ generic_dialog_add_message(GENERIC_DIALOG(fdlg), nullptr, title, nullptr, FALSE);
+ file_dialog_add_button(fdlg, icon_name, btntext, reinterpret_cast<void(*)(FileDialog *, gpointer)>(btnfunc), TRUE);
- file_dialog_add_path_widgets(fdlg, get_collections_dir(), NULL, "search_collection", GQ_COLLECTION_EXT, _("Collection Files"));
+ file_dialog_add_path_widgets(fdlg, get_collections_dir(), nullptr, "search_collection", GQ_COLLECTION_EXT, _("Collection Files"));
gtk_widget_show(GENERIC_DIALOG(fdlg)->dialog);
}
void search_new(FileData *dir_fd, FileData *example_file)
{
- SearchData *sd;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *hbox2;
GdkGeometry geometry;
gint i;
gchar *marks_string;
- LayoutWindow *lw = NULL;
+ LayoutWindow *lw = nullptr;
layout_valid(&lw);
- sd = g_new0(SearchData, 1);
+ auto sd = g_new0(SearchData, 1);
sd->search_dir_fd = file_data_ref(dir_fd);
sd->search_path_recurse = TRUE;
sd->search_similarity_path = g_strdup(example_file->path);
}
- sd->window = window_new(GTK_WINDOW_TOPLEVEL, "search", NULL, NULL, _("Image search"));
+ sd->window = window_new("search", nullptr, nullptr, _("Image search"));
DEBUG_NAME(sd->window);
gtk_window_set_resizable(GTK_WINDOW(sd->window), TRUE);
geometry.min_height = DEFAULT_MINIMAL_WINDOW_SIZE;
geometry.base_width = DEF_SEARCH_WIDTH;
geometry.base_height = DEF_SEARCH_HEIGHT;
- gtk_window_set_geometry_hints(GTK_WINDOW(sd->window), NULL, &geometry,
- GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE);
+ gtk_window_set_geometry_hints(GTK_WINDOW(sd->window), nullptr, &geometry,
+ static_cast<GdkWindowHints>(GDK_HINT_MIN_SIZE | GDK_HINT_BASE_SIZE));
if (lw && options->save_window_positions)
{
gtk_window_set_default_size(GTK_WINDOW(sd->window), lw->options.search_window.w, lw->options.search_window.h);
- gtk_window_move(GTK_WINDOW(sd->window), lw->options.search_window.x, lw->options.search_window.y);
+ gq_gtk_window_move(GTK_WINDOW(sd->window), lw->options.search_window.x, lw->options.search_window.y);
}
else
{
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
gtk_container_set_border_width(GTK_CONTAINER(vbox), PREF_PAD_GAP);
- gtk_container_add(GTK_CONTAINER(sd->window), vbox);
+ gq_gtk_container_add(GTK_WIDGET(sd->window), vbox);
gtk_widget_show(vbox);
sd->box_search = pref_box_new(vbox, FALSE, GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
sd->menu_path = menu_choice_menu(text_search_menu_path, sizeof(text_search_menu_path) / sizeof(MatchList),
G_CALLBACK(menu_choice_path_cb), sd);
- gtk_box_pack_start(GTK_BOX(hbox), sd->menu_path, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), sd->menu_path, FALSE, FALSE, 0);
gtk_widget_show(sd->menu_path);
hbox2 = pref_box_new(hbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
combo = tab_completion_new_with_history(&sd->path_entry, sd->search_dir_fd->path,
"search_path", -1,
- NULL, NULL);
- tab_completion_add_select_button(sd->path_entry, NULL, TRUE);
- gtk_box_pack_start(GTK_BOX(hbox2), combo, TRUE, TRUE, 0);
+ nullptr, nullptr);
+ tab_completion_add_select_button(sd->path_entry, nullptr, TRUE);
+ gq_gtk_box_pack_start(GTK_BOX(hbox2), combo, TRUE, TRUE, 0);
gtk_widget_show(combo);
sd->check_recurse = pref_checkbox_new_int(hbox2, _("Recurse"),
sd->search_path_recurse, &sd->search_path_recurse);
sd->collection = pref_box_new(hbox, TRUE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
sd->collection_entry = gtk_entry_new();
- gtk_entry_set_text(GTK_ENTRY(sd->collection_entry), "");
- gtk_box_pack_start(GTK_BOX(sd->collection), sd->collection_entry, TRUE, TRUE, 0);
+ gq_gtk_entry_set_text(GTK_ENTRY(sd->collection_entry), "");
+ gq_gtk_box_pack_start(GTK_BOX(sd->collection), sd->collection_entry, TRUE, TRUE, 0);
gtk_widget_show(sd->collection_entry);
sd->fd_button = gtk_button_new_with_label("...");
g_signal_connect(G_OBJECT(sd->fd_button), "clicked", G_CALLBACK(select_collection_clicked_cb), sd);
- gtk_box_pack_start(GTK_BOX(sd->collection), sd->fd_button, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(sd->collection), sd->fd_button, FALSE, FALSE, 0);
gtk_widget_show(sd->fd_button);
gtk_widget_hide(sd->collection);
text_search_menu_name, sizeof(text_search_menu_name) / sizeof(MatchList),
G_CALLBACK(menu_choice_name_cb), sd);
combo = history_combo_new(&sd->entry_name, "", "search_name", -1);
- gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
gtk_widget_show(combo);
pref_checkbox_new_int(hbox, _("Match case"),
sd->search_name_match_case, &sd->search_name_match_case);
+ pref_checkbox_new_int(hbox, _("Symbolic link"), sd->search_name_symbolic_link, &sd->search_name_symbolic_link);
gtk_widget_set_tooltip_text(GTK_WIDGET(combo), "When set to \"contains\" or \"path contains\", this field uses Perl Compatible Regular Expressions.\ne.g. use \n.*\\.jpg\n and not \n*.jpg\n\nSee the Help file.");
/* Search for file size */
sd->spin_size = menu_spin(hbox, 0, 1024*1024*1024, sd->search_size,
G_CALLBACK(menu_choice_spin_cb), &sd->search_size);
hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
- gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
pref_label_new(hbox2, _("and"));
sd->spin_size_end = menu_spin(hbox2, 0, 1024*1024*1024, sd->search_size_end,
G_CALLBACK(menu_choice_spin_cb), &sd->search_size_end);
G_CALLBACK(menu_choice_date_cb), sd);
sd->date_sel = date_selection_new();
- date_selection_time_set(sd->date_sel, time(NULL));
- gtk_box_pack_start(GTK_BOX(hbox), sd->date_sel, FALSE, FALSE, 0);
+ date_selection_time_set(sd->date_sel, time(nullptr));
+ gq_gtk_box_pack_start(GTK_BOX(hbox), sd->date_sel, FALSE, FALSE, 0);
gtk_widget_show(sd->date_sel);
hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
- gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
pref_label_new(hbox2, _("and"));
sd->date_sel_end = date_selection_new();
- date_selection_time_set(sd->date_sel_end, time(NULL));
- gtk_box_pack_start(GTK_BOX(hbox2), sd->date_sel_end, FALSE, FALSE, 0);
+ date_selection_time_set(sd->date_sel_end, time(nullptr));
+ gq_gtk_box_pack_start(GTK_BOX(hbox2), sd->date_sel_end, FALSE, FALSE, 0);
gtk_widget_show(sd->date_sel_end);
sd->date_type = gtk_combo_box_text_new();
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->date_type), _("Status Changed"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->date_type), _("Original"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->date_type), _("Digitized"));
- gtk_box_pack_start(GTK_BOX(hbox), sd->date_type, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), sd->date_type, FALSE, FALSE, 0);
gtk_combo_box_set_active(GTK_COMBO_BOX(sd->date_type), 0);
gtk_widget_set_tooltip_text(sd->date_type, "Modified (mtime)\nStatus Changed (ctime)\nOriginal (Exif.Photo.DateTimeOriginal)\nDigitized (Exif.Photo.DateTimeDigitized)");
gtk_widget_show(sd->date_type);
sd->spin_height = menu_spin(pad_box, 0, 1000000, sd->search_height,
G_CALLBACK(menu_choice_spin_cb), &sd->search_height);
hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 2);
- gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
pref_label_new(hbox2, _("and"));
pref_spacer(hbox2, PREF_PAD_SPACE - 2*2);
sd->spin_width_end = menu_spin(hbox2, 0, 1000000, sd->search_width_end,
G_CALLBACK(menu_choice_spin_cb), &sd->search_height_end);
/* Search for image similarity */
- hbox = menu_choice(sd->box_search, &sd->check_similarity, NULL,
+ hbox = menu_choice(sd->box_search, &sd->check_similarity, nullptr,
_("Image content is"), &sd->match_similarity_enable,
- NULL, 0, NULL, sd);
+ nullptr, 0, nullptr, sd);
sd->spin_similarity = menu_spin(hbox, 80, 100, sd->search_similarity,
G_CALLBACK(menu_choice_spin_cb), &sd->search_similarity);
combo = tab_completion_new_with_history(&sd->entry_similarity,
(sd->search_similarity_path) ? sd->search_similarity_path : "",
- "search_similarity_path", -1, NULL, NULL);
- tab_completion_add_select_button(sd->entry_similarity, NULL, FALSE);
- gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
+ "search_similarity_path", -1, nullptr, nullptr);
+ tab_completion_add_select_button(sd->entry_similarity, nullptr, FALSE);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), combo, TRUE, TRUE, 0);
gtk_widget_show(combo);
pref_checkbox_new_int(hbox, _("Ignore rotation"),
options->rot_invariant_sim, &options->rot_invariant_sim);
text_search_menu_keyword, sizeof(text_search_menu_keyword) / sizeof(MatchList),
G_CALLBACK(menu_choice_keyword_cb), sd);
sd->entry_keywords = gtk_entry_new();
- gtk_box_pack_start(GTK_BOX(hbox), sd->entry_keywords, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), sd->entry_keywords, TRUE, TRUE, 0);
gtk_widget_set_sensitive(sd->entry_keywords, sd->match_keywords_enable);
g_signal_connect(G_OBJECT(sd->check_keywords), "toggled",
G_CALLBACK(menu_choice_check_cb), sd->entry_keywords);
text_search_menu_comment, sizeof(text_search_menu_comment) / sizeof(MatchList),
G_CALLBACK(menu_choice_comment_cb), sd);
sd->entry_comment = gtk_entry_new();
- gtk_box_pack_start(GTK_BOX(hbox), sd->entry_comment, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), sd->entry_comment, TRUE, TRUE, 0);
gtk_widget_set_sensitive(sd->entry_comment, sd->match_comment_enable);
g_signal_connect(G_OBJECT(sd->check_comment), "toggled",
G_CALLBACK(menu_choice_check_cb), sd->entry_comment);
sd->spin_size = menu_spin(hbox, -1, 5, sd->search_rating,
G_CALLBACK(menu_choice_spin_cb), &sd->search_rating);
hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
- gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
pref_label_new(hbox2, _("and"));
sd->spin_rating_end = menu_spin(hbox2, -1, 5, sd->search_rating_end,
G_CALLBACK(menu_choice_spin_cb), &sd->search_rating_end);
G_CALLBACK(menu_choice_gps_cb), sd);
hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
- gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), hbox2, FALSE, FALSE, 0);
sd->spin_gps = menu_spin(hbox2, 1, 9999, sd->search_gps,
G_CALLBACK(menu_choice_spin_cb), &sd->search_gps);
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->units_gps), _("km"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->units_gps), _("miles"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->units_gps), _("n.m."));
- gtk_box_pack_start(GTK_BOX(hbox2), sd->units_gps, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox2), sd->units_gps, FALSE, FALSE, 0);
gtk_combo_box_set_active(GTK_COMBO_BOX(sd->units_gps), 0);
gtk_widget_set_tooltip_text(sd->units_gps, "kilometres, miles or nautical miles");
gtk_widget_show(sd->units_gps);
gtk_editable_set_editable(GTK_EDITABLE(sd->entry_gps_coord), TRUE);
gtk_widget_set_has_tooltip(sd->entry_gps_coord, TRUE);
gtk_widget_set_tooltip_text(sd->entry_gps_coord, _("Enter a coordinate in the form:\n89.123 179.456\nor drag-and-drop a geo-coded image\nor left-click on the map and paste\nor cut-and-paste or drag-and-drop\nan internet search URL\nSee the Help file"));
- gtk_box_pack_start(GTK_BOX(hbox2), sd->entry_gps_coord, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox2), sd->entry_gps_coord, TRUE, TRUE, 0);
gtk_widget_set_sensitive(sd->entry_gps_coord, TRUE);
gtk_widget_show(sd->entry_gps_coord);
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Metadata"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Unknown"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(sd->class_type), _("Broken"));
- gtk_box_pack_start(GTK_BOX(hbox), sd->class_type, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), sd->class_type, FALSE, FALSE, 0);
gtk_combo_box_set_active(GTK_COMBO_BOX(sd->class_type), 0);
gtk_widget_show(sd->class_type);
}
g_free(marks_string);
}
- gtk_box_pack_start(GTK_BOX(hbox), sd->marks_type, FALSE, FALSE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), sd->marks_type, FALSE, FALSE, 0);
gtk_combo_box_set_active(GTK_COMBO_BOX(sd->marks_type), 0);
gtk_widget_show(sd->marks_type);
/* Done the types of searches */
- scrolled = gtk_scrolled_window_new(NULL, NULL);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
+ scrolled = gq_gtk_scrolled_window_new(nullptr, nullptr);
+ gq_gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start(GTK_BOX(vbox), scrolled, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(vbox), scrolled, TRUE, TRUE, 0);
gtk_widget_show(scrolled);
store = gtk_list_store_new(8, G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_PIXBUF,
/* set up sorting */
sortable = GTK_TREE_SORTABLE(store);
gtk_tree_sortable_set_sort_func(sortable, SEARCH_COLUMN_RANK, search_result_sort_cb,
- GINT_TO_POINTER(SEARCH_COLUMN_RANK), NULL);
+ GINT_TO_POINTER(SEARCH_COLUMN_RANK), nullptr);
gtk_tree_sortable_set_sort_func(sortable, SEARCH_COLUMN_NAME, search_result_sort_cb,
- GINT_TO_POINTER(SEARCH_COLUMN_NAME), NULL);
+ GINT_TO_POINTER(SEARCH_COLUMN_NAME), nullptr);
gtk_tree_sortable_set_sort_func(sortable, SEARCH_COLUMN_SIZE, search_result_sort_cb,
- GINT_TO_POINTER(SEARCH_COLUMN_SIZE), NULL);
+ GINT_TO_POINTER(SEARCH_COLUMN_SIZE), nullptr);
gtk_tree_sortable_set_sort_func(sortable, SEARCH_COLUMN_DATE, search_result_sort_cb,
- GINT_TO_POINTER(SEARCH_COLUMN_DATE), NULL);
+ GINT_TO_POINTER(SEARCH_COLUMN_DATE), nullptr);
gtk_tree_sortable_set_sort_func(sortable, SEARCH_COLUMN_DIMENSIONS, search_result_sort_cb,
- GINT_TO_POINTER(SEARCH_COLUMN_DIMENSIONS), NULL);
+ GINT_TO_POINTER(SEARCH_COLUMN_DIMENSIONS), nullptr);
gtk_tree_sortable_set_sort_func(sortable, SEARCH_COLUMN_PATH, search_result_sort_cb,
- GINT_TO_POINTER(SEARCH_COLUMN_PATH), NULL);
+ GINT_TO_POINTER(SEARCH_COLUMN_PATH), nullptr);
#if 0
/* by default, search results are unsorted until user selects a sort column - for speed,
sd->result_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
g_object_unref(store);
- gtk_container_add(GTK_CONTAINER(scrolled), sd->result_view);
+ gq_gtk_container_add(GTK_WIDGET(scrolled), sd->result_view);
gtk_widget_show(sd->result_view);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(sd->result_view));
gtk_tree_selection_set_mode(GTK_TREE_SELECTION(selection), GTK_SELECTION_MULTIPLE);
- gtk_tree_selection_set_select_function(selection, search_result_select_cb, sd, NULL);
+ gtk_tree_selection_set_select_function(selection, search_result_select_cb, sd, nullptr);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(sd->result_view), TRUE);
gtk_tree_view_set_enable_search(GTK_TREE_VIEW(sd->result_view), FALSE);
G_CALLBACK(search_thumb_toggle_cb), sd);
gtk_widget_set_tooltip_text(GTK_WIDGET(sd->button_thumbs), "Ctrl-T");
- frame = gtk_frame_new(NULL);
+ frame = gtk_frame_new(nullptr);
DEBUG_NAME(frame);
- gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
- gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, PREF_PAD_SPACE);
+ gq_gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, TRUE, PREF_PAD_SPACE);
gtk_widget_show(frame);
sd->label_status = gtk_label_new("");
gtk_widget_set_size_request(sd->label_status, 50, -1);
- gtk_container_add(GTK_CONTAINER(frame), sd->label_status);
+ gq_gtk_container_add(GTK_WIDGET(frame), sd->label_status);
gtk_widget_show(sd->label_status);
sd->label_progress = gtk_progress_bar_new();
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(sd->label_progress), "");
gtk_progress_bar_set_show_text(GTK_PROGRESS_BAR(sd->label_progress), TRUE);
- gtk_box_pack_start(GTK_BOX(hbox), sd->label_progress, TRUE, TRUE, 0);
+ gq_gtk_box_pack_start(GTK_BOX(hbox), sd->label_progress, TRUE, TRUE, 0);
gtk_widget_show(sd->label_progress);
- sd->spinner = spinner_new(NULL, -1);
- gtk_box_pack_start(GTK_BOX(hbox), sd->spinner, FALSE, FALSE, 0);
+ sd->spinner = gtk_spinner_new();
+ gq_gtk_box_pack_start(GTK_BOX(hbox), sd->spinner, FALSE, FALSE, 0);
gtk_widget_show(sd->spinner);
- sd->button_help = pref_button_new(hbox, GTK_STOCK_HELP, NULL, FALSE, G_CALLBACK(search_window_help_cb), sd);
+ sd->button_help = pref_button_new(hbox, GQ_ICON_HELP, _("Help"), G_CALLBACK(search_window_help_cb), sd);
gtk_widget_set_tooltip_text(GTK_WIDGET(sd->button_help), "F1");
gtk_widget_set_sensitive(sd->button_help, TRUE);
pref_spacer(hbox, PREF_PAD_BUTTON_GAP);
- sd->button_start = pref_button_new(hbox, GTK_STOCK_FIND, NULL, FALSE,
+ sd->button_start = pref_button_new(hbox, GQ_ICON_FIND, _("Find"),
G_CALLBACK(search_start_cb), sd);
gtk_widget_set_tooltip_text(GTK_WIDGET(sd->button_start), "Ctrl-Return");
pref_spacer(hbox, PREF_PAD_BUTTON_GAP);
- sd->button_stop = pref_button_new(hbox, GTK_STOCK_STOP, NULL, FALSE,
+ sd->button_stop = pref_button_new(hbox, GQ_ICON_STOP, _("Stop"),
G_CALLBACK(search_start_cb), sd);
gtk_widget_set_tooltip_text(GTK_WIDGET(sd->button_stop), "Ctrl-Return");
gtk_widget_set_sensitive(sd->button_stop, FALSE);
pref_spacer(hbox, PREF_PAD_BUTTON_GAP);
- sd->button_close = pref_button_new(hbox, GTK_STOCK_CLOSE, NULL, FALSE, G_CALLBACK(search_window_close_cb), sd);
+ sd->button_close = pref_button_new(hbox, GQ_ICON_CLOSE, _("Close"), G_CALLBACK(search_window_close_cb), sd);
gtk_widget_set_tooltip_text(GTK_WIDGET(sd->button_close), "Ctrl-W");
gtk_widget_set_sensitive(sd->button_close, TRUE);
static void search_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
- SearchData *sd = static_cast<SearchData *>(data);
+ auto sd = static_cast<SearchData *>(data);
if (!(type & NOTIFY_CHANGE) || !fd->change) return;
work = list;
while (work)
{
- MatchFileData *mfd = static_cast<MatchFileData *>(work->data);
+ auto mfd = static_cast<MatchFileData *>(work->data);
file_data_unref((FileData *)mfd->fd);
work = work->next;
}
projects / geeqie.git / blobdiff