Deduplicate FILE_COLUMN_POINTER
[geeqie.git] / src / ui-misc.cc
index f5ed0a4..81973ff 100644 (file)
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "ui-misc.h"
+
+#include <langinfo.h>
+
 #include <cstdlib>
 #include <cstring>
 
-#include "main.h"
+#include <pango/pango.h>
+
+#include <config.h>
+
+#include "compat.h"
+#include "debug.h"
 #include "history-list.h"
 #include "layout.h"
-#include "ui-misc.h"
+#include "main-defines.h"
+#include "misc.h"
+#include "options.h"
+#include "typedefs.h"
 #include "utilops.h"
 
-#include <langinfo.h>
-
 /*
  *-----------------------------------------------------------------------------
  * widget and layout utilities
@@ -50,7 +60,7 @@ GtkWidget *pref_box_new(GtkWidget *parent_box, gboolean fill,
                box = gtk_box_new(GTK_ORIENTATION_VERTICAL, padding);
                }
 
-       gtk_box_pack_start(GTK_BOX(parent_box), box, fill, fill, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), box, fill, fill, 0);
        gtk_widget_show(box);
 
        return box;
@@ -77,7 +87,7 @@ GtkWidget *pref_group_new(GtkWidget *parent_box, gboolean fill,
                g_list_free(list);
                }
 
-       gtk_box_pack_start(GTK_BOX(parent_box), vbox, fill, fill, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), vbox, fill, fill, 0);
        gtk_widget_show(vbox);
 
        label = gtk_label_new(text);
@@ -85,11 +95,11 @@ GtkWidget *pref_group_new(GtkWidget *parent_box, gboolean fill,
        gtk_label_set_yalign(GTK_LABEL(label), 0.5);
        pref_label_bold(label, TRUE, FALSE);
 
-       gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_INDENT);
-       gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 0);
        gtk_widget_show(hbox);
 
        /* indent using empty box */
@@ -103,7 +113,7 @@ GtkWidget *pref_group_new(GtkWidget *parent_box, gboolean fill,
                {
                box = gtk_box_new(GTK_ORIENTATION_VERTICAL, PREF_PAD_GAP);
                }
-       gtk_box_pack_start(GTK_BOX(hbox), box, TRUE, TRUE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(hbox), box, TRUE, TRUE, 0);
        gtk_widget_show(box);
 
        g_object_set_data(G_OBJECT(box), "pref_group", vbox);
@@ -137,7 +147,7 @@ GtkWidget *pref_frame_new(GtkWidget *parent_box, gboolean fill,
        GtkWidget *frame = nullptr;
 
        frame = gtk_frame_new(text);
-       gtk_box_pack_start(GTK_BOX(parent_box), frame, fill, fill, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), frame, fill, fill, 0);
        gtk_widget_show(frame);
 
        if (orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -148,7 +158,7 @@ GtkWidget *pref_frame_new(GtkWidget *parent_box, gboolean fill,
                {
                box = gtk_box_new(GTK_ORIENTATION_VERTICAL, padding);
                }
-       gtk_container_add(GTK_CONTAINER(frame), box);
+       gq_gtk_container_add(GTK_WIDGET(frame), box);
        gtk_container_set_border_width(GTK_CONTAINER(box), PREF_PAD_BORDER);
        gtk_widget_show(box);
 
@@ -160,7 +170,7 @@ GtkWidget *pref_spacer(GtkWidget *parent_box, gboolean padding)
        GtkWidget *spacer;
 
        spacer = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-       gtk_box_pack_start(GTK_BOX(parent_box), spacer, FALSE, FALSE, padding / 2);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), spacer, FALSE, FALSE, padding / 2);
        gtk_widget_show(spacer);
 
        return spacer;
@@ -171,7 +181,7 @@ GtkWidget *pref_line(GtkWidget *parent_box, gboolean padding)
        GtkWidget *spacer;
 
        spacer = gtk_separator_new(GTK_IS_HBOX(parent_box) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL);
-       gtk_box_pack_start(GTK_BOX(parent_box), spacer, FALSE, FALSE, padding / 2);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), spacer, FALSE, FALSE, padding / 2);
        gtk_widget_show(spacer);
 
        return spacer;
@@ -182,7 +192,7 @@ GtkWidget *pref_label_new(GtkWidget *parent_box, const gchar *text)
        GtkWidget *label;
 
        label = gtk_label_new(text);
-       gtk_box_pack_start(GTK_BOX(parent_box), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        return label;
@@ -194,7 +204,7 @@ GtkWidget *pref_label_new_mnemonic(GtkWidget *parent_box, const gchar *text, Gtk
 
        label = gtk_label_new_with_mnemonic(text);
        gtk_label_set_mnemonic_widget(GTK_LABEL(label), widget);
-       gtk_box_pack_start(GTK_BOX(parent_box), label, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), label, FALSE, FALSE, 0);
        gtk_widget_show(label);
 
        return label;
@@ -253,7 +263,7 @@ GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *icon_name,
 
        if (parent_box)
                {
-               gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
                gtk_widget_show(button);
                }
 
@@ -276,7 +286,7 @@ static GtkWidget *real_pref_checkbox_new(GtkWidget *parent_box, const gchar *tex
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
        if (func) g_signal_connect(G_OBJECT(button), "clicked", func, data);
 
-       gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        return button;
@@ -335,7 +345,7 @@ void pref_checkbox_link_sensitivity(GtkWidget *button, GtkWidget *widget)
 #pragma GCC diagnostic ignored "-Wunused-function"
 static void pref_checkbox_link_sensitivity_swap_cb_unused(GtkWidget *button, gpointer data)
 {
-       GtkWidget *widget = static_cast<GtkWidget *>(data);
+       auto *widget = static_cast<GtkWidget *>(data);
 
        gtk_widget_set_sensitive(widget, !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)));
 }
@@ -354,11 +364,19 @@ static GtkWidget *real_pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *si
                                            GCallback func, gpointer data)
 {
        GtkWidget *button;
+#if HAVE_GTK4
+       GtkToggleButton *group;;
+#else
        GSList *group;
+#endif
 
        if (sibling)
                {
+#if HAVE_GTK4
+               group = sibling;
+#else
                group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(sibling));
+#endif
                }
        else
                {
@@ -367,17 +385,27 @@ static GtkWidget *real_pref_radiobutton_new(GtkWidget *parent_box, GtkWidget *si
 
        if (mnemonic_text)
                {
+#if HAVE_GTK4
+               button = gtk_toggle_button_new_with_mnemonic(text);
+               gtk_toggle_button_set_group(button, group);
+#else
                button = gtk_radio_button_new_with_mnemonic(group, text);
+#endif
                }
        else
                {
+#if HAVE_GTK4
+               button = gtk_toggle_button_new_with_label(text);
+               gtk_toggle_button_set_group(button, group);
+#else
                button = gtk_radio_button_new_with_label(group, text);
+#endif
                }
 
        if (active) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active);
        if (func) g_signal_connect(G_OBJECT(button), "clicked", func, data);
 
-       gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(parent_box), button, FALSE, FALSE, 0);
        gtk_widget_show(button);
 
        return button;
@@ -403,7 +431,7 @@ GtkWidget *pref_radiobutton_new_mnemonic_unused(GtkWidget *parent_box, GtkWidget
 
 static void pref_radiobutton_int_cb_unused(GtkWidget *widget, gpointer data)
 {
-       gboolean *result = static_cast<gboolean *>(data);
+       auto *result = static_cast<gboolean *>(data);
 
        if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
                {
@@ -461,7 +489,7 @@ static GtkWidget *real_pref_spin_new(GtkWidget *parent_box, const gchar *text, c
                pref_link_sensitivity(label, spin);
                }
 
-       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);
 
        /* perhaps this should only be PREF_PAD_GAP distance from spinbutton ? */
@@ -537,18 +565,17 @@ void pref_signal_unblock_data(GtkWidget *widget, gpointer data)
                                          0, 0, nullptr, nullptr, data);
 }
 
-GtkWidget *pref_table_new(GtkWidget *parent_box, gint columns, gint rows,
-                         gboolean homogeneous, gboolean fill)
+GtkWidget *pref_table_new(GtkWidget *parent_box, gint, gint, gboolean, gboolean fill)
 {
        GtkWidget *table;
 
-       table = gtk_table_new(rows, columns, homogeneous);
-       gtk_table_set_row_spacings(GTK_TABLE(table), PREF_PAD_GAP);
-       gtk_table_set_col_spacings(GTK_TABLE(table), PREF_PAD_SPACE);
+       table = gtk_grid_new();
+       gtk_grid_set_row_spacing(GTK_GRID(table), PREF_PAD_GAP);
+       gtk_grid_set_column_spacing(GTK_GRID(table), PREF_PAD_SPACE);
 
        if (parent_box)
                {
-               gtk_box_pack_start(GTK_BOX(parent_box), table, fill, fill, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent_box), table, fill, fill, 0);
                gtk_widget_show(table);
                }
 
@@ -579,8 +606,7 @@ GtkWidget *pref_table_box(GtkWidget *table, gint column, gint row,
                shell = box;
                }
 
-       gtk_table_attach(GTK_TABLE(table), shell, column, column + 1, row, row + 1,
-                        static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(0), 0, 0);
+       gq_gtk_grid_attach(GTK_GRID(table), shell, column, column + 1, row, row + 1, static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(0), 0, 0);
 
        gtk_widget_show(shell);
 
@@ -595,8 +621,7 @@ GtkWidget *pref_table_label(GtkWidget *table, gint column, gint row,
        label = gtk_label_new(text);
        gtk_widget_set_halign(label, alignment);
        gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
-       gtk_table_attach(GTK_TABLE(table), label, column, column + 1, row, row + 1,
-                        GTK_FILL, static_cast<GtkAttachOptions>(0), 0, 0);
+       gq_gtk_grid_attach(GTK_GRID(table), label, column, column + 1, row, row + 1,  GTK_FILL, static_cast<GtkAttachOptions>(0), 0, 0);
        gtk_widget_show(label);
 
        return label;
@@ -609,8 +634,7 @@ GtkWidget *pref_table_button(GtkWidget *table, gint column, gint row,
        GtkWidget *button;
 
        button = pref_button_new(nullptr, stock_id, text, func, data);
-       gtk_table_attach(GTK_TABLE(table), button, column, column + 1, row, row + 1,
-                        GTK_FILL, static_cast<GtkAttachOptions>(0), 0, 0);
+       gq_gtk_grid_attach(GTK_GRID(table), button, column, column + 1, row, row + 1,  GTK_FILL, static_cast<GtkAttachOptions>(0), 0, 0);
        gtk_widget_show(button);
 
        return button;
@@ -644,7 +668,7 @@ GtkWidget *pref_table_spin(GtkWidget *table, gint column, gint row,
        if (suffix)
                {
                box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE);
-               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);
 
                label = pref_label_new(box, suffix);
@@ -655,8 +679,7 @@ GtkWidget *pref_table_spin(GtkWidget *table, gint column, gint row,
                box = spin;
                }
 
-       gtk_table_attach(GTK_TABLE(table), box, column, column + 1, row, row + 1,
-                        static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), 0, 0);
+       gq_gtk_grid_attach(GTK_GRID(table), box, column, column + 1, row, row + 1, static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), 0, 0);
        gtk_widget_show(box);
 
        return spin;
@@ -676,16 +699,15 @@ GtkWidget *pref_table_spin_new_int(GtkWidget *table, gint column, gint row,
 }
 
 
-GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style)
+GtkWidget *pref_toolbar_new(GtkWidget *parent_box)
 {
        GtkWidget *tbar;
 
-       tbar = gtk_toolbar_new();
-       gtk_toolbar_set_style(GTK_TOOLBAR(tbar), style);
+       tbar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
 
        if (parent_box)
                {
-               gtk_box_pack_start(GTK_BOX(parent_box), tbar, FALSE, FALSE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent_box), tbar, FALSE, FALSE, 0);
                gtk_widget_show(tbar);
                }
        return tbar;
@@ -717,7 +739,7 @@ GtkWidget *pref_toolbar_button(GtkWidget *toolbar,
        gtk_tool_button_set_use_underline(GTK_TOOL_BUTTON(item), TRUE);
 
        if (func) g_signal_connect(item, "clicked", func, data);
-       gtk_container_add(GTK_CONTAINER(toolbar), item);
+       gq_gtk_container_add(GTK_WIDGET(toolbar), item);
        gtk_widget_show(item);
 
        if (description)
@@ -747,7 +769,7 @@ GtkWidget *pref_toolbar_spacer_unused(GtkWidget *toolbar)
        GtkWidget *item;
 
        item = GTK_WIDGET(gtk_separator_tool_item_new());
-       gtk_container_add(GTK_CONTAINER(toolbar), item);
+       gq_gtk_container_add(GTK_WIDGET(toolbar), item);
        gtk_widget_show(item);
 
        return item;
@@ -792,7 +814,7 @@ static void date_selection_popup_hide(DateSelection *ds)
 
        gtk_widget_hide(ds->window);
 
-       gtk_widget_destroy(ds->window);
+       gq_gtk_widget_destroy(ds->window);
        ds->window = nullptr;
        ds->calendar = nullptr;
 
@@ -810,9 +832,12 @@ static gboolean date_selection_popup_release_cb(GtkWidget *, GdkEventButton *, g
 static gboolean date_selection_popup_press_cb(GtkWidget *, GdkEventButton *event, gpointer data)
 {
        auto ds = static_cast<DateSelection *>(data);
-       gint x, y;
-       gint w, h;
-       gint xr, yr;
+       gint x;
+       gint y;
+       gint w;
+       gint h;
+       gint xr;
+       gint yr;
        GdkWindow *window;
 
        xr = static_cast<gint>(event->x_root);
@@ -835,10 +860,23 @@ static gboolean date_selection_popup_press_cb(GtkWidget *, GdkEventButton *event
 
 static void date_selection_popup_sync(DateSelection *ds)
 {
-       guint day, month, year;
+       guint day;
+       guint month;
+       guint year;
+
+#if HAVE_GTK4
+       GDateTime *date_selected;
 
+       date_selected = gtk_calendar_get_date(GTK_CALENDAR(ds->calendar));
+       g_date_time_get_ymd(date_selected, static_cast<guint>(&year), static_cast<guint>(&month), static_cast<guint>(&day));
+
+       g_date_time_unref(date_selected);
+#else
        gtk_calendar_get_date(GTK_CALENDAR(ds->calendar), &year, &month, &day);
-       date_selection_set(ds->box, day, month + 1, year);
+       /* month is range 0 to 11 */
+       month = month + 1;
+#endif
+       date_selection_set(ds->box, day, month, year);
 }
 
 static gboolean date_selection_popup_keypress_cb(GtkWidget *, GdkEventKey *event, gpointer data)
@@ -880,9 +918,11 @@ static void date_selection_doubleclick_cb(GtkWidget *, gpointer data)
 
 static void date_selection_popup(DateSelection *ds)
 {
-       gint x, y;
-       gint wx, wy;
-       gint day, month, year;
+       GDateTime *date;
+       gint wx;
+       gint wy;
+       gint x;
+       gint y;
        GtkAllocation button_allocation;
        GtkAllocation window_allocation;
 
@@ -896,12 +936,17 @@ static void date_selection_popup(DateSelection *ds)
                         G_CALLBACK(date_selection_popup_keypress_cb), ds);
 
        ds->calendar = gtk_calendar_new();
-       gtk_container_add(GTK_CONTAINER(ds->window), ds->calendar);
+       gq_gtk_container_add(GTK_WIDGET(ds->window), ds->calendar);
        gtk_widget_show(ds->calendar);
 
-       date_selection_get(ds->box, &day, &month, &year);
-       gtk_calendar_select_month(GTK_CALENDAR(ds->calendar), month - 1, year);
-       gtk_calendar_select_day(GTK_CALENDAR(ds->calendar), day);
+       date = date_selection_get(ds->box);
+#if HAVE_GTK4
+       gtk_calendar_select_day(GTK_CALENDAR(ds->calendar), date);
+#else
+       gtk_calendar_select_month(GTK_CALENDAR(ds->calendar), g_date_time_get_month(date), g_date_time_get_year(date));
+       gtk_calendar_select_day(GTK_CALENDAR(ds->calendar), g_date_time_get_day_of_month(date));
+#endif
+       g_date_time_unref(date);
 
        g_signal_connect(G_OBJECT(ds->calendar), "day_selected",
                         G_CALLBACK(date_selection_day_cb), ds);
@@ -925,7 +970,7 @@ static void date_selection_popup(DateSelection *ds)
        if (x < 0) x = 0;
        if (y < 0) y = 0;
 
-       gtk_window_move(GTK_WINDOW(ds->window), x, y);
+       gq_gtk_window_move(GTK_WINDOW(ds->window), x, y);
        gtk_widget_show(ds->window);
 
        gtk_widget_grab_focus(ds->calendar);
@@ -1035,10 +1080,10 @@ GtkWidget *date_selection_new()
                         G_CALLBACK(button_size_allocate_cb), ds->spin_y);
 
        icon = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON);
-       gtk_container_add(GTK_CONTAINER(ds->button), icon);
+       gq_gtk_container_add(GTK_WIDGET(ds->button), icon);
        gtk_widget_show(icon);
 
-       gtk_box_pack_start(GTK_BOX(ds->box), ds->button, FALSE, FALSE, 0);
+       gq_gtk_box_pack_start(GTK_BOX(ds->box), ds->button, FALSE, FALSE, 0);
        g_signal_connect(G_OBJECT(ds->button), "clicked",
                         G_CALLBACK(date_selection_button_cb), ds);
        gtk_widget_show(ds->button);
@@ -1060,17 +1105,34 @@ void date_selection_set(GtkWidget *widget, gint day, gint month, gint year)
        gtk_spin_button_set_value(GTK_SPIN_BUTTON(ds->spin_y), static_cast<gdouble>(year));
 }
 
-
-void date_selection_get(GtkWidget *widget, gint *day, gint *month, gint *year)
+/**
+ * @brief Returns date structure set to value of spin buttons
+ * @param widget #DateSelection
+ * @returns
+ *
+ * Free returned structure with g_date_time_unref();
+ */
+GDateTime *date_selection_get(GtkWidget *widget)
 {
        DateSelection *ds;
+       gint day;
+       gint month;
+       gint year;
+       GDateTime *date;
 
        ds = static_cast<DateSelection *>(g_object_get_data(G_OBJECT(widget), DATE_SELECION_KEY));
-       if (!ds) return;
+       if (!ds)
+               {
+               return nullptr;
+               }
+
+       day = gtk_spin_button_get_value(GTK_SPIN_BUTTON(ds->spin_d));
+       month = gtk_spin_button_get_value(GTK_SPIN_BUTTON(ds->spin_m));
+       year = gtk_spin_button_get_value(GTK_SPIN_BUTTON(ds->spin_y));
 
-       if (day) *day = gtk_spin_button_get_value(GTK_SPIN_BUTTON(ds->spin_d));
-       if (month) *month = gtk_spin_button_get_value(GTK_SPIN_BUTTON(ds->spin_m));
-       if (year) *year = gtk_spin_button_get_value(GTK_SPIN_BUTTON(ds->spin_y));
+       date = g_date_time_new_local(year, month, day, 0, 0, 0);
+
+       return date;
 }
 
 void date_selection_time_set(GtkWidget *widget, time_t t)
@@ -1092,7 +1154,7 @@ time_t date_selection_time_get_unused(GtkWidget *widget)
        gint month = 0;
        gint year = 0;
 
-       date_selection_get(widget, &day, &month ,&year);
+       date_selection_get(widget);
 
        lt.tm_sec = 0;
        lt.tm_min = 0;
@@ -1256,7 +1318,7 @@ gboolean pref_list_double_get_unused(const gchar *group, const gchar *key, gdoub
 
        if (pref_list_get(group, key, PREF_LIST_MARKER_DOUBLE, &text) && text)
                {
-               *result = g_ascii_strtod(text, NULL);
+               *result = g_ascii_strtod(text, nullptr);
                return TRUE;
                }
 
@@ -1277,20 +1339,18 @@ gboolean pref_list_string_get_unused(const gchar *group, const gchar *key, const
 
 void pref_color_button_set_cb(GtkWidget *widget, gpointer data)
 {
-       auto color = static_cast<GdkColor *>(data);
+       auto color = static_cast<GdkRGBA *>(data);
 
-       gtk_color_button_get_color(GTK_COLOR_BUTTON(widget), color);
+       gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), color);
 }
 
-GtkWidget *pref_color_button_new(GtkWidget *parent_box,
-                                const gchar *title, const GdkColor *color,
-                                GCallback func, gpointer data)
+GtkWidget *pref_color_button_new(GtkWidget *parent_box, const gchar *title, GdkRGBA *color, GCallback func, gpointer data)
 {
        GtkWidget *button;
 
        if (color)
                {
-               button = gtk_color_button_new_with_color(color);
+               button = gtk_color_button_new_with_rgba(color);
                }
        else
                {
@@ -1308,12 +1368,12 @@ GtkWidget *pref_color_button_new(GtkWidget *parent_box,
                label = gtk_label_new(title);
 
                hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-               gtk_box_pack_start(GTK_BOX(parent_box), hbox, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(parent_box), hbox, TRUE, TRUE, 0);
 
-               gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
-               gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
+               gq_gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, TRUE, 0);
 
-               gtk_widget_show_all(hbox);
+               gq_gtk_widget_show_all(hbox);
                }
        else
                {
@@ -1334,22 +1394,23 @@ gchar *text_widget_text_pull(GtkWidget *text_widget)
        if (GTK_IS_TEXT_VIEW(text_widget))
                {
                GtkTextBuffer *buffer;
-               GtkTextIter start, end;
+               GtkTextIter start;
+               GtkTextIter end;
 
                buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_widget));
                gtk_text_buffer_get_bounds(buffer, &start, &end);
 
                return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
                }
-       else if (GTK_IS_ENTRY(text_widget))
-               {
-               return g_strdup(gtk_entry_get_text(GTK_ENTRY(text_widget)));
-               }
-       else
+
+       if (GTK_IS_ENTRY(text_widget))
                {
-               return nullptr;
+               return g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(text_widget)));
                }
 
+       return nullptr;
+       
+
 }
 
 gchar *text_widget_text_pull_selected(GtkWidget *text_widget)
@@ -1357,7 +1418,8 @@ gchar *text_widget_text_pull_selected(GtkWidget *text_widget)
        if (GTK_IS_TEXT_VIEW(text_widget))
                {
                GtkTextBuffer *buffer;
-               GtkTextIter start, end;
+               GtkTextIter start;
+               GtkTextIter end;
 
                buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text_widget));
                gtk_text_buffer_get_bounds(buffer, &start, &end);
@@ -1370,14 +1432,14 @@ gchar *text_widget_text_pull_selected(GtkWidget *text_widget)
 
                return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
                }
-       else if (GTK_IS_ENTRY(text_widget))
-               {
-               return g_strdup(gtk_entry_get_text(GTK_ENTRY(text_widget)));
-               }
-       else
+
+       if (GTK_IS_ENTRY(text_widget))
                {
-               return nullptr;
+               return g_strdup(gq_gtk_entry_get_text(GTK_ENTRY(text_widget)));
                }
+
+       return nullptr;
+       
 }
 
 static gint simple_sort_cb(gconstpointer a, gconstpointer b)
@@ -1427,8 +1489,10 @@ GList* get_action_items()
        gchar *tooltip;
        GList *actions;
        GList *groups;
-       GList *list = nullptr;
-       GList *work;
+       GList *list_duplicates = nullptr;
+       GList *list_unique = nullptr;
+       GList *work1;
+       GList *work2;
        GtkAction *action;
        LayoutWindow *lw = nullptr;
 
@@ -1476,36 +1540,10 @@ GList* get_action_items()
                                                action_item->label = g_strdup(label);
                                                }
 
-                                       action_item->name = g_strdup(action_name);
+                                       action_item->name = action_name;
                                        action_item->icon_name = g_strdup(gtk_action_get_stock_id(action));
 
-                                       /* Ignore duplicate entries */
-                                       work = list;
-                                       duplicate = FALSE;
-                                       while (work)
-                                               {
-                                               if (g_strcmp0(tooltip, static_cast<ActionItem *>(work->data)->label) == 0)
-                                                       {
-                                                       duplicate = TRUE;
-                                                       break;
-                                                       }
-                                               work = work->next;
-                                               }
-
-                                       if (duplicate)
-                                               {
-                                               g_free((gchar *)action_item->icon_name);
-                                               g_free((gchar *)action_item->name);
-                                               g_free((gchar *)action_item->label);
-                                               g_free(action_item);
-                                               }
-                                       else
-                                               {
-                                               list = g_list_prepend(list, action_item);
-                                               }
-                                       g_free(action_name);
-                                       g_free(label);
-                                       g_free(tooltip);
+                                       list_duplicates = g_list_prepend(list_duplicates, action_item);
                                        }
                                }
                        actions = actions->next;
@@ -1514,9 +1552,40 @@ GList* get_action_items()
                groups = groups->next;
                }
 
-       list = g_list_sort(list, simple_sort_cb);
+       /* Use the shortest name i.e. ignore -Alt versions. Sort makes the shortest first in the list */
+       list_duplicates = g_list_sort(list_duplicates, simple_sort_cb);
 
-       return list;
+       /* Ignore duplicate entries */
+       work1 = list_duplicates;
+       while (work1)
+               {
+               duplicate = FALSE;
+               work2 = list_unique;
+               /* The first entry must be unique, list_unique is null so control bypasses the while */
+               while (work2)
+                       {
+                       if (g_strcmp0(static_cast<ActionItem *>(work2->data)->label, static_cast<ActionItem *>(work1->data)->label) == 0)
+                               {
+                               duplicate = TRUE;
+                               break;
+                               }
+                       work2 = work2->next;
+                       }
+
+               if (!duplicate)
+                       {
+                       action_item = g_new0(ActionItem, 1);
+                       action_item->name = g_strdup(static_cast<ActionItem *>(work1->data)->name);
+                       action_item->label = g_strdup(static_cast<ActionItem *>(work1->data)->label);
+                       action_item->icon_name = g_strdup(static_cast<ActionItem *>(work1->data)->icon_name);
+                       list_unique = g_list_append(list_unique, action_item);
+                       }
+               work1 = work1->next;
+               }
+
+       g_list_free_full(list_duplicates, free_action_items_cb);
+
+       return list_unique;
 }
 
 gboolean defined_mouse_buttons(GtkWidget *, GdkEventButton *event, gpointer data)
@@ -1572,4 +1641,15 @@ gboolean defined_mouse_buttons(GtkWidget *, GdkEventButton *event, gpointer data
        return ret;
 }
 
+GdkPixbuf *gq_gtk_icon_theme_load_icon_copy(GtkIconTheme *icon_theme, const gchar *icon_name, gint size, GtkIconLookupFlags flags)
+{
+       GError *error = nullptr;
+       GdkPixbuf *icon = gtk_icon_theme_load_icon(icon_theme, icon_name, size, flags, &error);
+       if (error) return nullptr;
+
+       GdkPixbuf *pixbuf = gdk_pixbuf_copy(icon);
+       g_object_unref(icon);
+       return pixbuf;
+}
+
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */