*-----------------------------------------------------------------------------
*/
-static void zoom_increment_cb(GtkWidget *spin, gpointer data)
+static void zoom_increment_cb(GtkWidget *spin, gpointer UNUSED(data))
{
c_options->image.zoom_increment = (gint)(gtk_spin_button_get_value(GTK_SPIN_BUTTON(spin)) * 100.0 + 0.01);
}
-static void slideshow_delay_hours_cb(GtkWidget *spin, gpointer data)
+static void slideshow_delay_hours_cb(GtkWidget *spin, gpointer UNUSED(data))
{
gint mins_secs_tenths, delay;
SLIDESHOW_SUBSECOND_PRECISION;
}
-static void slideshow_delay_minutes_cb(GtkWidget *spin, gpointer data)
+static void slideshow_delay_minutes_cb(GtkWidget *spin, gpointer UNUSED(data))
{
gint hours, secs_tenths, delay;
SLIDESHOW_SUBSECOND_PRECISION;
}
-static void slideshow_delay_seconds_cb(GtkWidget *spin, gpointer data)
+static void slideshow_delay_seconds_cb(GtkWidget *spin, gpointer UNUSED(data))
{
gint hours_mins, delay;
}
-static gboolean accel_apply_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean accel_apply_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer UNUSED(data))
{
gchar *accel_path, *accel;
options->image.limit_autofit_size = c_options->image.limit_autofit_size;
options->image.max_autofit_size = c_options->image.max_autofit_size;
options->image.max_enlargement_size = c_options->image.max_enlargement_size;
- options->image.use_clutter_renderer = c_options->image.use_clutter_renderer;
+ //~ options->image.use_clutter_renderer = c_options->image.use_clutter_renderer;
options->image.tile_size = c_options->image.tile_size;
options->progressive_key_scrolling = c_options->progressive_key_scrolling;
options->keyboard_scroll_step = c_options->keyboard_scroll_step;
*-----------------------------------------------------------------------------
*/
-static void config_window_close_cb(GtkWidget *widget, gpointer data)
+static void config_window_close_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
gtk_widget_destroy(configwindow);
configwindow = NULL;
filter_store = NULL;
}
-static void config_window_help_cb(GtkWidget *widget, gpointer data)
+static void config_window_help_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkWidget *notebook = data;
gint i;
help_window_show(html_section[i]);
}
-static gboolean config_window_delete(GtkWidget *widget, GdkEventAny *event, gpointer data)
+static gboolean config_window_delete(GtkWidget *UNUSED(widget), GdkEventAny *UNUSED(event), gpointer UNUSED(data))
{
config_window_close_cb(NULL, NULL);
return TRUE;
gtk_widget_show(combo);
}
-static void thumb_size_menu_cb(GtkWidget *combo, gpointer data)
+static void thumb_size_menu_cb(GtkWidget *combo, gpointer UNUSED(data))
{
gint n;
}
}
-static void filter_store_ext_edit_cb(GtkCellRendererText *cell, gchar *path_str,
+static void filter_store_ext_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *path_str,
gchar *new_text, gpointer data)
{
GtkWidget *model = data;
filter_rebuild();
}
-static void filter_store_class_edit_cb(GtkCellRendererText *cell, gchar *path_str,
+static void filter_store_class_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *path_str,
gchar *new_text, gpointer data)
{
GtkWidget *model = data;
filter_rebuild();
}
-static void filter_store_desc_edit_cb(GtkCellRendererText *cell, gchar *path_str,
+static void filter_store_desc_edit_cb(GtkCellRendererText *UNUSED(cell), gchar *path_str,
gchar *new_text, gpointer data)
{
GtkWidget *model = data;
gtk_tree_path_free(tpath);
}
-static void filter_store_enable_cb(GtkCellRendererToggle *renderer,
+static void filter_store_enable_cb(GtkCellRendererToggle *UNUSED(renderer),
gchar *path_str, gpointer data)
{
GtkWidget *model = data;
filter_rebuild();
}
-static void filter_store_writable_cb(GtkCellRendererToggle *renderer,
+static void filter_store_writable_cb(GtkCellRendererToggle *UNUSED(renderer),
gchar *path_str, gpointer data)
{
GtkWidget *model = data;
filter_rebuild();
}
-static void filter_store_sidecar_cb(GtkCellRendererToggle *renderer,
+static void filter_store_sidecar_cb(GtkCellRendererToggle *UNUSED(renderer),
gchar *path_str, gpointer data)
{
GtkWidget *model = data;
filter_rebuild();
}
-static void filter_set_func(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
+static void filter_set_func(GtkTreeViewColumn *UNUSED(tree_column), GtkCellRenderer *cell,
GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
{
FilterEntry *fe;
return(FALSE);
}
-static void filter_add_cb(GtkWidget *widget, gpointer data)
+static void filter_add_cb(GtkWidget *UNUSED(widget), gpointer data)
{
filter_add_unique("description", ".new", FORMAT_CLASS_IMAGE, TRUE, FALSE, TRUE);
filter_store_populate();
g_idle_add((GSourceFunc)filter_add_scroll, data);
}
-static void filter_remove_cb(GtkWidget *widget, gpointer data)
+static void filter_remove_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkWidget *filter_view = data;
GtkTreeSelection *selection;
return(FALSE);
}
-static void filter_default_ok_cb(GenericDialog *gd, gpointer data)
+static void filter_default_ok_cb(GenericDialog *gd, gpointer UNUSED(data))
{
filter_reset();
filter_add_defaults();
g_idle_add((GSourceFunc)filter_default_ok_scroll, gd->data);
}
-static void dummy_cancel_cb(GenericDialog *gd, gpointer data)
+static void dummy_cancel_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
/* no op, only so cancel button appears */
}
!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
}
-static void safe_delete_view_cb(GtkWidget *widget, gpointer data)
+static void safe_delete_view_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
layout_set_path(NULL, gtk_entry_get_text(GTK_ENTRY(safe_delete_path_entry)));
}
-static void safe_delete_clear_ok_cb(GenericDialog *gd, gpointer data)
+static void safe_delete_clear_ok_cb(GenericDialog *UNUSED(gd), gpointer UNUSED(data))
{
file_util_trash_clear();
}
-static void safe_delete_clear_cb(GtkWidget *widget, gpointer data)
+static void safe_delete_clear_cb(GtkWidget *widget, gpointer UNUSED(data))
{
GenericDialog *gd;
GtkWidget *entry;
gtk_widget_show(gd->dialog);
}
-static void image_overlay_template_view_changed_cb(GtkWidget *widget, gpointer data)
+static void image_overlay_template_view_changed_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkWidget *pTextView;
GtkTextBuffer *pTextBuffer;
gtk_text_buffer_get_text(pTextBuffer, &iStart, &iEnd, TRUE));
}
-static void image_overlay_default_template_ok_cb(GenericDialog *gd, gpointer data)
+static void image_overlay_default_template_ok_cb(GenericDialog *UNUSED(gd), gpointer data)
{
GtkTextView *text_view = data;
GtkTextBuffer *buffer;
gtk_widget_show(gd->dialog);
}
-static void image_overlay_help_cb(GtkWidget *widget, gpointer data)
+static void image_overlay_help_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
help_window_show("GuideOptionsOSD.html");
}
-static void image_overlay_set_font_cb(GtkWidget *widget, gpointer data)
+static void image_overlay_set_font_cb(GtkWidget *widget, gpointer UNUSED(data))
{
-#if GTK_CHECK_VERSION(3,4,0)
GtkWidget *dialog;
char *font;
PangoFontDescription *font_desc;
}
gtk_widget_destroy(dialog);
-#else
- const char *font;
-
- font = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget));
- c_options->image_overlay.font = g_strdup(font);
-#endif
}
-static void image_overlay_set_text_colour_cb(GtkWidget *widget, gpointer data)
+static void image_overlay_set_text_colour_cb(GtkWidget *widget, gpointer UNUSED(data))
{
GtkWidget *dialog;
-#if GTK_CHECK_VERSION(3,4,0)
GdkRGBA colour;
dialog = gtk_color_chooser_dialog_new("Image Overlay Text Colour", GTK_WINDOW(gtk_widget_get_toplevel(widget)));
c_options->image_overlay.text_alpha = colour.alpha*255;
}
gtk_widget_destroy(dialog);
-#else
- GdkColor colour;
- GtkColorSelection *colorsel;
-
- dialog = gtk_color_selection_dialog_new("Image Overlay Text Colour");
- gtk_window_set_keep_above(GTK_WINDOW(dialog),TRUE);
- colour.red = options->image_overlay.text_red*257;
- colour.green = options->image_overlay.text_green*257;
- colour.blue = options->image_overlay.text_blue*257;
- colorsel = GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dialog)));
- gtk_color_selection_set_has_opacity_control(colorsel, TRUE);
- gtk_color_selection_set_current_color(colorsel, &colour);
- gtk_color_selection_set_current_alpha(colorsel, options->image_overlay.text_alpha*257);
-
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
- {
- gtk_color_selection_get_current_color(colorsel, &colour);
- c_options->image_overlay.text_red = colour.red/257;
- c_options->image_overlay.text_green = colour.green/257;
- c_options->image_overlay.text_blue = colour.blue/257;
- c_options->image_overlay.text_alpha = gtk_color_selection_get_current_alpha(colorsel)/257;
- }
- gtk_widget_destroy (dialog);
-#endif
}
-static void image_overlay_set_background_colour_cb(GtkWidget *widget, gpointer data)
+static void image_overlay_set_background_colour_cb(GtkWidget *widget, gpointer UNUSED(data))
{
GtkWidget *dialog;
-#if GTK_CHECK_VERSION(3,4,0)
GdkRGBA colour;
dialog = gtk_color_chooser_dialog_new("Image Overlay Background Colour", GTK_WINDOW(gtk_widget_get_toplevel(widget)));
c_options->image_overlay.background_alpha = colour.alpha*255;
}
gtk_widget_destroy(dialog);
-#else
- GdkColor colour;
- GtkColorSelection *colorsel;
-
- dialog = gtk_color_selection_dialog_new("Image Overlay Background Colour");
- gtk_window_set_keep_above(GTK_WINDOW(dialog),TRUE);
- colour.red = options->image_overlay.background_red*257;
- colour.green = options->image_overlay.background_green*257;
- colour.blue = options->image_overlay.background_blue*257;
- colorsel = GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dialog)));
- gtk_color_selection_set_has_opacity_control(colorsel, TRUE);
- gtk_color_selection_set_current_color(colorsel, &colour);
- gtk_color_selection_set_current_alpha(colorsel, options->image_overlay.background_alpha*257);
-
- if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
- {
- gtk_color_selection_get_current_color(colorsel, &colour);
- c_options->image_overlay.background_red = colour.red/257;
- c_options->image_overlay.background_green = colour.green/257;
- c_options->image_overlay.background_blue = colour.blue/257;
- c_options->image_overlay.background_alpha = gtk_color_selection_get_current_alpha(colorsel)/257;
- }
- gtk_widget_destroy(dialog);
-#endif
}
static void accel_store_populate(void)
}
}
-static void accel_store_cleared_cb(GtkCellRendererAccel *accel, gchar *path_string, gpointer user_data)
+static void accel_store_cleared_cb(GtkCellRendererAccel *UNUSED(accel), gchar *UNUSED(path_string), gpointer UNUSED(user_data))
{
}
-static gboolean accel_remove_key_cb(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+static gboolean accel_remove_key_cb(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer data)
{
gchar *accel1 = data;
gchar *accel2;
}
-static void accel_store_edited_cb(GtkCellRendererAccel *accel, gchar *path_string, guint accel_key, GdkModifierType accel_mods, guint hardware_keycode, gpointer user_data)
+static void accel_store_edited_cb(GtkCellRendererAccel *UNUSED(accel), gchar *path_string, guint accel_key, GdkModifierType accel_mods, guint UNUSED(hardware_keycode), gpointer UNUSED(user_data))
{
GtkTreeModel *model = (GtkTreeModel *)accel_store;
GtkTreeIter iter;
return(FALSE);
}
-static void accel_default_cb(GtkWidget *widget, gpointer data)
+static void accel_default_cb(GtkWidget *UNUSED(widget), gpointer data)
{
accel_store_populate();
g_idle_add((GSourceFunc)accel_default_scroll, data);
}
-void accel_remove_selection(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+void accel_remove_selection(GtkTreeModel *UNUSED(model), GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer UNUSED(data))
{
gtk_tree_store_set(accel_store, iter, AE_KEY, "", -1);
}
-void accel_reset_selection(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
+void accel_reset_selection(GtkTreeModel *model, GtkTreePath *UNUSED(path), GtkTreeIter *iter, gpointer UNUSED(data))
{
GtkAccelKey key;
gchar *accel_path, *accel;
g_free(accel);
}
-static void accel_reset_cb(GtkWidget *widget, gpointer data)
+static void accel_reset_cb(GtkWidget *UNUSED(widget), gpointer data)
{
GtkTreeSelection *selection;
gtk_container_add(GTK_CONTAINER(scrolled), viewport);
gtk_widget_show(viewport);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add(GTK_CONTAINER(viewport), vbox);
gtk_widget_show(vbox);
return vbox;
}
-static void cache_standard_cb(GtkWidget *widget, gpointer data)
+static void cache_standard_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
}
}
-static void cache_geeqie_cb(GtkWidget *widget, gpointer data)
+static void cache_geeqie_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
}
}
-static void cache_local_cb(GtkWidget *widget, gpointer data)
+static void cache_local_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
}
}
-static void help_search_engine_entry_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos,
- GdkEvent *event, gpointer userdata)
+static void help_search_engine_entry_icon_cb(GtkEntry *UNUSED(entry), GtkEntryIconPosition pos,
+ GdkEvent *UNUSED(event), gpointer userdata)
{
if (pos == GTK_ENTRY_ICON_PRIMARY)
{
}
}
-static void star_rating_star_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos,
- GdkEvent *event, gpointer userdata)
+static void star_rating_star_icon_cb(GtkEntry *UNUSED(entry), GtkEntryIconPosition pos,
+ GdkEvent *UNUSED(event), gpointer userdata)
{
gchar *rating_symbol;
}
}
-static void star_rating_rejected_icon_cb(GtkEntry *entry, GtkEntryIconPosition pos,
- GdkEvent *event, gpointer userdata)
+static void star_rating_rejected_icon_cb(GtkEntry *UNUSED(entry), GtkEntryIconPosition pos,
+ GdkEvent *UNUSED(event), gpointer userdata)
{
gchar *rating_symbol;
}
}
-static guint star_rating_symbol_test(GtkWidget *widget, gpointer data)
+static guint star_rating_symbol_test(GtkWidget *UNUSED(widget), gpointer data)
{
GtkContainer *hbox = data;
GString *str = g_string_new(NULL);
GtkWidget *enlargement_button;
GtkWidget *table;
GtkWidget *spin;
- GtkWidget *two_pass;
-#ifdef HAVE_CLUTTER
- GtkWidget *gpu_accel;
-#endif
+//~ #ifdef HAVE_CLUTTER
+ //~ GtkWidget *gpu_accel;
+//~ #endif
vbox = scrolled_notebook_page(notebook, _("Image"));
table = pref_table_new(group, 2, 1, FALSE, FALSE);
add_quality_menu(table, 0, 0, _("Quality:"), options->image.zoom_quality, &c_options->image.zoom_quality);
- if (options->image.use_clutter_renderer && !options->disable_gpu)
- {
- gtk_widget_set_sensitive(table, FALSE);
- }
-
-#ifdef HAVE_CLUTTER
- gpu_accel = pref_checkbox_new_int(group, _("Use GPU acceleration via Clutter library (Requires restart)"),
- options->image.use_clutter_renderer, &c_options->image.use_clutter_renderer);
- if (options->disable_gpu && !options->override_disable_gpu)
- {
- gtk_widget_set_sensitive(gpu_accel, FALSE);
- }
-#endif
-
- two_pass = pref_checkbox_new_int(group, _("Two pass rendering (apply HQ zoom and color correction in second pass)"),
+ //~ if (options->image.use_clutter_renderer && !options->disable_gpu)
+ //~ {
+ //~ gtk_widget_set_sensitive(table, FALSE);
+ //~ }
+
+//~ #ifdef HAVE_CLUTTER
+ //~ gpu_accel = pref_checkbox_new_int(group, _("Use GPU acceleration via Clutter library (Requires restart)"),
+ //~ options->image.use_clutter_renderer, &c_options->image.use_clutter_renderer);
+ //~ if (options->disable_gpu && !options->override_disable_gpu)
+ //~ {
+ //~ gtk_widget_set_sensitive(gpu_accel, FALSE);
+ //~ }
+//~ #endif
+
+ pref_checkbox_new_int(group, _("Two pass rendering (apply HQ zoom and color correction in second pass)"),
options->image.zoom_2pass, &c_options->image.zoom_2pass);
- if (options->image.use_clutter_renderer && !options->disable_gpu)
- {
- gtk_widget_set_sensitive(two_pass, FALSE);
- }
+ //~ if (options->image.use_clutter_renderer && !options->disable_gpu)
+ //~ {
+ //~ gtk_widget_set_sensitive(two_pass, FALSE);
+ //~ }
c_options->image.zoom_increment = options->image.zoom_increment;
spin = pref_spin_new(group, _("Zoom increment:"), NULL,
gtk_widget_set_tooltip_text(GTK_WIDGET(hbox), _("This value will set the virtual size of the window when \"Fit image to window\" is set. Instead of using the actual size of the window, the specified percentage of the window will be used. It allows one to keep a border around the image (values lower than 100%) or to auto zoom the image (values greater than 100%). It affects fullscreen mode too."));
group = pref_group_new(vbox, FALSE, _("Tile size"), GTK_ORIENTATION_VERTICAL);
- gtk_widget_set_sensitive(group, !options->image.use_clutter_renderer);
+ //~ gtk_widget_set_sensitive(group, !options->image.use_clutter_renderer);
hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
spin = pref_spin_new_int(hbox, _("Pixels"), _("(Requires restart)"),
/* windows tab */
-static void save_default_window_layout_cb(GtkWidget *widget, gpointer data)
+static void save_default_window_layout_cb(GtkWidget *UNUSED(widget), gpointer UNUSED(data))
{
LayoutWindow *lw = NULL;
gchar *default_path;
g_free(default_path);
}
-#if GTK_CHECK_VERSION(3,22,0)
static gboolean popover_cb(gpointer data)
{
GtkPopover *popover = data;
return FALSE;
}
-static void default_layout_changed_cb(GtkWidget *button, GtkPopover *popover)
+static void default_layout_changed_cb(GtkWidget *UNUSED(button), GtkPopover *popover)
{
gtk_popover_popup(popover);
return popover;
}
-#endif
static void config_tab_windows(GtkWidget *notebook)
{
pref_label_new(subgroup, _("Use current layout for default: "));
button = pref_button_new(subgroup, NULL, _("Set"), FALSE, G_CALLBACK(save_default_window_layout_cb), NULL);
-#if GTK_CHECK_VERSION(3,22,0)
GtkWidget *popover;
popover = create_popover(button, gtk_label_new(_("Current window layout\nhas been set as default")), GTK_POS_TOP);
gtk_popover_set_modal(GTK_POPOVER (popover), FALSE);
g_signal_connect(button, "clicked", G_CALLBACK(default_layout_changed_cb), popover);
-#endif
group = pref_group_new(vbox, FALSE, _("Size"), GTK_ORIENTATION_VERTICAL);
hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP);
-#if GTK_CHECK_VERSION(3,4,0)
button = pref_button_new(NULL, GTK_STOCK_SELECT_FONT, _("Font"), FALSE,
G_CALLBACK(image_overlay_set_font_cb), notebook);
-#else
- button = gtk_font_button_new();
- gtk_font_button_set_title(GTK_FONT_BUTTON(button), "Image Overlay Font");
- gtk_font_button_set_font_name(GTK_FONT_BUTTON(button), options->image_overlay.font);
- g_signal_connect(G_OBJECT(button), "font-set",
- G_CALLBACK(image_overlay_set_font_cb),NULL);
-#endif
+
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_widget_show(button);
pref_line(group, PREF_PAD_GAP);
group = pref_group_new(vbox, FALSE, _("Exif, XMP or IPTC tags"), GTK_ORIENTATION_VERTICAL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
label = gtk_label_new(_("%Exif.Image.Orientation%"));
pref_spacer(group,TRUE);
group = pref_group_new(vbox, FALSE, _("Field separators"), GTK_ORIENTATION_VERTICAL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
label = gtk_label_new(_("Separator shown only if both fields are non-null:\n%formatted.ShutterSpeed%|%formatted.ISOSpeedRating%"));
pref_spacer(group,TRUE);
group = pref_group_new(vbox, FALSE, _("Field maximum length"), GTK_ORIENTATION_VERTICAL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
label = gtk_label_new(_("%path:39%"));
pref_spacer(group,TRUE);
group = pref_group_new(vbox, FALSE, _("Pre- and post- text"), GTK_ORIENTATION_VERTICAL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
label = gtk_label_new(_("Text shown only if the field is non-null:\n%formatted.Aperture:F no. * setting%\n %formatted.Aperture:10:F no. * setting%"));
pref_spacer(group,TRUE);
group = pref_group_new(vbox, FALSE, _("Pango markup"), GTK_ORIENTATION_VERTICAL);
- hbox = gtk_hbox_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(group), hbox, FALSE, FALSE, 0);
gtk_widget_show(hbox);
label = gtk_label_new(_("<b>bold</b>\n<u>underline</u>\n<i>italic</i>\n<s>strikethrough</s>"));
return ret;
}
-static gboolean search_function_cb(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer search_data)
+static gboolean search_function_cb(GtkTreeModel *model, gint UNUSED(column), const gchar *key, GtkTreeIter *iter, gpointer UNUSED(search_data))
{
FilterEntry *fe;
gboolean ret = TRUE;
label = pref_label_new(group, _("Warning: Geeqie is built without Exiv2. Some options are disabled."));
#endif
label = pref_label_new(group, _("When writing metadata, Geeqie will follow these steps, if selected. This process will stop when the first successful write occurs."));
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#endif
+
gtk_widget_set_tooltip_text(label, _("A flowchart of the sequence is shown in the Help file"));
ct_button = pref_checkbox_new_int(group, "", options->metadata.save_in_image_file, &c_options->metadata.save_in_image_file);
gtk_label_set_markup (GTK_LABEL(label), markup);
g_free(markup);
-#if GTK_CHECK_VERSION(3,16,0)
gtk_label_set_xalign(GTK_LABEL(label), 0.0);
gtk_label_set_yalign(GTK_LABEL(label), 0.5);
-#else
- gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-#endif
gtk_misc_set_padding(GTK_MISC(label), 22, 0);
pref_spacer(group, PREF_PAD_GROUP);
pref_spacer(group, PREF_PAD_GROUP);
#ifdef HAVE_SPELL
-#if GTK_CHECK_VERSION(3,20,0)
group = pref_group_new(vbox, FALSE, _("Spelling checks"), GTK_ORIENTATION_VERTICAL);
ct_button = pref_checkbox_new_int(group, _("Check spelling - Requires restart"), options->metadata.check_spelling, &c_options->metadata.check_spelling);
gtk_widget_set_tooltip_text(ct_button, _("Spelling checks are performed on info sidebar panes Comment, Headline and Title"));
-#endif
#endif
pref_spacer(group, PREF_PAD_GROUP);
kfd->list_dir = NULL;
}
-static void keywords_find_close_cb(GenericDialog *fd, gpointer data)
+static void keywords_find_close_cb(GenericDialog *UNUSED(fd), gpointer data)
{
KeywordFindData *kfd = data;
gtk_widget_set_sensitive(kfd->button_close, TRUE);
}
-static void keywords_find_stop_cb(GenericDialog *fd, gpointer data)
+static void keywords_find_stop_cb(GenericDialog *UNUSED(fd), gpointer data)
{
KeywordFindData *kfd = data;
return FALSE;
}
-static void keywords_find_start_cb(GenericDialog *fd, gpointer data)
+static void keywords_find_start_cb(GenericDialog *UNUSED(fd), gpointer data)
{
KeywordFindData *kfd = data;
gchar *path;
gtk_widget_show(kfd->gd->dialog);
}
-static void keywords_find_cb(GtkWidget *widget, gpointer data)
+static void keywords_find_cb(GtkWidget *widget, gpointer UNUSED(data))
{
const gchar *path = layout_get_path(NULL);
gtk_widget_show(scrolled);
#ifdef HAVE_SPELL
-#if GTK_CHECK_VERSION(3,20,0)
if (options->metadata.check_spelling)
{
gspell_view = gspell_text_view_get_from_gtk_text_view(GTK_TEXT_VIEW(keyword_text));
gspell_text_view_basic_setup(gspell_view);
}
-#endif
#endif
gtk_container_add(GTK_CONTAINER(scrolled), keyword_text);
}
/* advanced entry tab */
-static void use_geeqie_trash_cb(GtkWidget *widget, gpointer data)
+static void use_geeqie_trash_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
}
}
-static void use_system_trash_cb(GtkWidget *widget, gpointer data)
+static void use_system_trash_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
}
}
-static void use_no_cache_cb(GtkWidget *widget, gpointer data)
+static void use_no_cache_cb(GtkWidget *widget, gpointer UNUSED(data))
{
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{
gtk_window_set_resizable(GTK_WINDOW(configwindow), TRUE);
gtk_container_set_border_width(GTK_CONTAINER(configwindow), PREF_PAD_BORDER);
- win_vbox = gtk_vbox_new(FALSE, PREF_PAD_SPACE);
+ win_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_SPACE);
gtk_container_add(GTK_CONTAINER(configwindow), win_vbox);
gtk_widget_show(win_vbox);
}
}
-static void timezone_cancel_button_cb(GenericDialog *gd, gpointer data)
+static void timezone_cancel_button_cb(GenericDialog *UNUSED(gd), gpointer data)
{
TZData *tz = data;
projects / geeqie.git / blobdiff