Replace deprecated gdk_window_get_pointer

[geeqie.git] / src / menu.cc

diff --git a/src/menu.cc b/src/menu.cc
index ddc9b76..9ac9994 100644 (file)
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -19,14 +19,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "menu.h"
 
+#include <gdk/gdk.h>
+
 #include "collect-io.h"
 #include "collect-table.h"
+#include "collect.h"
 #include "editors.h"
+#include "intl.h"
+#include "main-defines.h"
 #include "pixbuf-util.h"
-#include "ui-fileops.h"
 #include "ui-menu.h"
 
 static GtkWidget *real_submenu_add_alter(GtkWidget *menu, GCallback func, gpointer data,
@@ -54,7 +57,7 @@ static GtkWidget *add_menu_item(GtkWidget *menu, gchar *label, GtkAccelGroup *ac
 
 gpointer submenu_item_get_data(GtkWidget *menu)
 {
-       if (!gtk_widget_get_parent(menu) || !GTK_IS_MENU(gtk_widget_get_parent(menu))) return NULL;
+       if (!gtk_widget_get_parent(menu) || !GTK_IS_MENU(gtk_widget_get_parent(menu))) return nullptr;
 
        return g_object_get_data(G_OBJECT(gtk_widget_get_parent(menu)), "submenu_data");
 }
@@ -64,7 +67,7 @@ gpointer submenu_item_get_data(GtkWidget *menu)
  * edit menu
  *-----------------------------------------------------------------------------
  */
-static void edit_item_destroy_cb(GtkWidget *UNUSED(widget), gpointer data)
+static void edit_item_destroy_cb(GtkWidget *, gpointer data)
 {
        g_free(data);
 }
@@ -80,13 +83,13 @@ static void add_edit_items(GtkWidget *menu, GCallback func, GList *fd_list)
                work = work->next;
                gboolean active = TRUE;
 
-               if (fd_list && EDITOR_ERRORS(editor_command_parse(editor, fd_list, FALSE, NULL)))
+               if (fd_list && EDITOR_ERRORS(editor_command_parse(editor, fd_list, FALSE, nullptr)))
                        active = FALSE;
 
                if (active)
                        {
                        GtkWidget *item;
-                       const gchar *stock_id = NULL;
+                       const gchar *stock_id = nullptr;
                        gchar *key = g_strdup(editor->key);
 
                        if (editor->icon && register_theme_icon_as_stock(key, editor->icon))
@@ -108,7 +111,7 @@ GtkWidget *submenu_add_edit(GtkWidget *menu, GtkWidget **menu_item, GCallback fu
        GtkAccelGroup *accel_group;
 
        accel_group = gtk_accel_group_new();
-       item = menu_item_add(menu, _("_Plugins"), NULL, NULL);
+       item = menu_item_add(menu, _("_Plugins"), nullptr, nullptr);
 
        submenu = gtk_menu_new();
        g_object_set_data(G_OBJECT(submenu), "submenu_data", data);
@@ -155,6 +158,9 @@ gchar *sort_type_get_text(SortType method)
                case SORT_PATH:
                        return _("Sort by path");
                        break;
+               case SORT_NUMBER:
+                       return _("Sort by number");
+                       break;
                case SORT_RATING:
                        return _("Sort by rating");
                        break;
@@ -167,7 +173,7 @@ gchar *sort_type_get_text(SortType method)
                        break;
                }
 
-       return ("");
+       return nullptr;
 }
 
 static GtkWidget *submenu_add_sort_item(GtkWidget *menu,
@@ -201,6 +207,7 @@ GtkWidget *submenu_add_sort(GtkWidget *menu, GCallback func, gpointer data,
        g_object_set_data(G_OBJECT(submenu), "submenu_data", data);
 
        submenu_add_sort_item(submenu, func, SORT_NAME, show_current, type);
+       submenu_add_sort_item(submenu, func, SORT_NUMBER, show_current, type);
        submenu_add_sort_item(submenu, func, SORT_TIME, show_current, type);
        submenu_add_sort_item(submenu, func, SORT_CTIME, show_current, type);
        submenu_add_sort_item(submenu, func, SORT_EXIFTIME, show_current, type);
@@ -215,7 +222,7 @@ GtkWidget *submenu_add_sort(GtkWidget *menu, GCallback func, gpointer data,
                {
                GtkWidget *item;
 
-               item = menu_item_add(menu, _("Sort"), NULL, NULL);
+               item = menu_item_add(menu, _("Sort"), nullptr, nullptr);
                gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
                return item;
                }
@@ -233,6 +240,7 @@ GtkWidget *submenu_add_dir_sort(GtkWidget *menu, GCallback func, gpointer data,
        g_object_set_data(G_OBJECT(submenu), "submenu_data", data);
 
        submenu_add_sort_item(submenu, func, SORT_NAME, show_current, type);
+       submenu_add_sort_item(submenu, func, SORT_NUMBER, show_current, type);
        submenu_add_sort_item(submenu, func, SORT_TIME, show_current, type);
        if (include_path) submenu_add_sort_item(submenu, func, SORT_PATH, show_current, type);
        if (include_none) submenu_add_sort_item(submenu, func, SORT_NONE, show_current, type);
@@ -241,7 +249,7 @@ GtkWidget *submenu_add_dir_sort(GtkWidget *menu, GCallback func, gpointer data,
                {
                GtkWidget *item;
 
-               item = menu_item_add(menu, _("Sort"), NULL, NULL);
+               item = menu_item_add(menu, _("Sort"), nullptr, nullptr);
                gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
                return item;
                }
@@ -267,7 +275,7 @@ gchar *zoom_type_get_text(ZoomMode method)
                        break;
                }
 
-       return ("");
+       return nullptr;
 }
 
 static GtkWidget *submenu_add_zoom_item(GtkWidget *menu,
@@ -292,8 +300,7 @@ static GtkWidget *submenu_add_zoom_item(GtkWidget *menu,
 }
 
 GtkWidget *submenu_add_zoom(GtkWidget *menu, GCallback func, gpointer data,
-                           gboolean UNUSED(include_none), gboolean UNUSED(include_path),
-                           gboolean show_current, ZoomMode mode)
+                           gboolean, gboolean, gboolean show_current, ZoomMode mode)
 {
        GtkWidget *submenu;
 
@@ -315,7 +322,7 @@ GtkWidget *submenu_add_zoom(GtkWidget *menu, GCallback func, gpointer data,
                {
                GtkWidget *item;
 
-               item = menu_item_add(menu, _("Zoom"), NULL, NULL);
+               item = menu_item_add(menu, _("Zoom"), nullptr, nullptr);
                gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
                return item;
                }
@@ -355,7 +362,7 @@ gchar *alter_type_get_text(AlterType type)
                        break;
                }
 
-       return ("");
+       return nullptr;
 }
 
 static void submenu_add_alter_item(GtkWidget *menu, GCallback func, AlterType type,
@@ -392,7 +399,7 @@ static GtkWidget *real_submenu_add_alter(GtkWidget *menu, GCallback func, gpoint
                {
                GtkWidget *item;
 
-               item = menu_item_add(menu, _("_Orientation"), NULL, NULL);
+               item = menu_item_add(menu, _("_Orientation"), nullptr, nullptr);
                gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
                return item;
                }
@@ -423,8 +430,7 @@ GtkWidget *submenu_add_alter(GtkWidget *menu, GCallback func, gpointer data)
  *
  *  Used by all image windows
  */
-static void add_collection_list(GtkWidget *menu, GCallback func,
-                                                               GList *collection_list, gpointer UNUSED(data))
+static void add_collection_list(GtkWidget *menu, GCallback func, GList *collection_list, gpointer)
 {
        GList *work;
        gint index = 0; /* index to existing collection list menu item selected */
@@ -446,18 +452,18 @@ GtkWidget *submenu_add_collections(GtkWidget *menu, GtkWidget **menu_item,
 {
        GtkWidget *item;
        GtkWidget *submenu;
-       GList *collection_list = NULL;
+       GList *collection_list = nullptr;
 
-       item = menu_item_add(menu, _("_Add to Collection"), NULL, NULL);
+       item = menu_item_add(menu, _("_Add to Collection"), nullptr, nullptr);
 
        submenu = gtk_menu_new();
        g_object_set_data(G_OBJECT(submenu), "submenu_data", data);
 
        menu_item_add_stock_sensitive(submenu, _("New collection"),
-                                       GTK_STOCK_INDEX, TRUE, G_CALLBACK(func), GINT_TO_POINTER(-1));
+                                       GQ_ICON_COLLECTION, TRUE, G_CALLBACK(func), GINT_TO_POINTER(-1));
        menu_item_add_divider(submenu);
 
-       collect_manager_list(&collection_list,NULL,NULL);
+       collect_manager_list(&collection_list,nullptr,nullptr);
        add_collection_list(submenu, func, collection_list, data);
 
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu);
@@ -479,22 +485,22 @@ void pop_menu_collections(GList *selection_list, gpointer data)
 {
        CollectWindow *cw;
        gchar *collection_name;
-       GList *collection_list = NULL;
+       GList *collection_list = nullptr;
        gchar *name;
        const gint index = GPOINTER_TO_INT(data);
 
        if (index >= 0)
                {
-               collect_manager_list(&collection_list, NULL, NULL);
+               collect_manager_list(&collection_list, nullptr, nullptr);
                collection_name = static_cast<gchar *>(g_list_nth_data(collection_list, index));
                name = collection_path(collection_name);
                cw = collection_window_new(name);
                g_free(name);
-               string_list_free(collection_list);
+               g_list_free_full(collection_list, g_free);
                }
        else
                {
-               cw = collection_window_new(NULL);
+               cw = collection_window_new(nullptr);
                }
 
        collection_table_add_filelist(cw->table, selection_list);