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;
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),"");
}
}
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),"");
}
}
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),"");
}
}
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, static_cast<GRegexMatchFlags>(0), nullptr);
+ 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, static_cast<GRegexMatchFlags>(0), nullptr);
- 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);
+ }
}
}
}
static void search_start_cb(GtkWidget *, gpointer data)
{
auto sd = static_cast<SearchData *>(data);
- GtkTreeViewColumn *column;
- gchar *path;
- gchar *entry_text;
gchar *collection;
+ gchar *entry_text;
+ gchar *path;
+ GDateTime *date;
+ GtkTreeViewColumn *column;
if (sd->search_folder_list)
{
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))
{
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;
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);
}
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))
{
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;
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;
search_window_get_geometry(sd);
- gtk_widget_destroy(sd->window);
+ gq_gtk_widget_destroy(sd->window);
}
static void search_window_close_cb(GtkWidget *, gpointer data)
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);
sd->search_similarity_path = g_strdup(example_file->path);
}
- sd->window = window_new(GTK_WINDOW_TOPLEVEL, "search", nullptr, nullptr, _("Image search"));
+ sd->window = window_new("search", nullptr, nullptr, _("Image search"));
DEBUG_NAME(sd->window);
gtk_window_set_resizable(GTK_WINDOW(sd->window), TRUE);
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);
"search_path", -1,
nullptr, nullptr);
tab_completion_add_select_button(sd->path_entry, nullptr, TRUE);
- gtk_box_pack_start(GTK_BOX(hbox2), combo, TRUE, TRUE, 0);
+ 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);
sd->date_sel = date_selection_new();
date_selection_time_set(sd->date_sel, time(nullptr));
- gtk_box_pack_start(GTK_BOX(hbox), sd->date_sel, FALSE, FALSE, 0);
+ 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(nullptr));
- gtk_box_pack_start(GTK_BOX(hbox2), sd->date_sel_end, FALSE, FALSE, 0);
+ 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,
(sd->search_similarity_path) ? sd->search_similarity_path : "",
"search_similarity_path", -1, nullptr, nullptr);
tab_completion_add_select_button(sd->entry_similarity, nullptr, FALSE);
- 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, _("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(nullptr, nullptr);
- 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,
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));
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 = gtk_spinner_new();
- gtk_box_pack_start(GTK_BOX(hbox), sd->spinner, FALSE, FALSE, 0);
+ 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, 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, GQ_ICON_FIND, nullptr,
+ 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);
projects / geeqie.git / blobdiff