#include "main.h"
#include "menu.h"
-#include "cache-maint.h"
-#include "collect.h"
-#include "collect-dlg.h"
#include "collect-io.h"
#include "collect-table.h"
-#include "dupe.h"
#include "editors.h"
-#include "filedata.h"
-#include "img-view.h"
#include "pixbuf-util.h"
-#include "preferences.h"
-#include "slideshow.h"
-#include "utilops.h"
#include "ui-fileops.h"
-#include "ui-tabcomp.h"
#include "ui-menu.h"
static GtkWidget *real_submenu_add_alter(GtkWidget *menu, GCallback func, gpointer data,
GtkWidget *item;
item = gtk_menu_item_new_with_label(label);
- gtk_widget_add_accelerator(item, "activate", accel_group, accel_key, accel_mods, GTK_ACCEL_VISIBLE);
+ gtk_widget_add_accelerator(item, "activate", accel_group, accel_key, static_cast<GdkModifierType>(accel_mods), GTK_ACCEL_VISIBLE);
g_signal_connect(G_OBJECT(item), "activate", func, data);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
gtk_widget_show(item);
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");
}
* 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);
}
while (work)
{
- const EditorDescription *editor = work->data;
+ auto editor = static_cast<const EditorDescription *>(work->data);
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))
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);
break;
}
- return "";
+ return nullptr;
}
static GtkWidget *submenu_add_sort_item(GtkWidget *menu,
g_object_set_data(G_OBJECT(submenu), "submenu_data", data);
submenu_add_sort_item(submenu, func, SORT_NAME, show_current, type);
-#ifdef HAVE_STRVERSCMP
submenu_add_sort_item(submenu, func, SORT_NUMBER, show_current, type);
-#endif
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);
{
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;
}
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);
{
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;
}
break;
}
- return "";
+ return nullptr;
}
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;
{
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;
}
break;
}
- return "";
+ return nullptr;
}
static void submenu_add_alter_item(GtkWidget *menu, GCallback func, AlterType type,
{
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;
}
/**
* @brief Add submenu consisting of "New collection", and list of existing collections to a right-click menu.
- * @param[in] menu
- * @param[in] func
+ * @param[in] menu
+ * @param[in] func
* @param[in] collection_list Type gchar
- * @param[in] data
- *
+ * @param[in] 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 */
work = collection_list;
while (work)
{
- const gchar *collection_name = work->data;
+ auto collection_name = static_cast<const gchar *>(work->data);
menu_item_add(menu, collection_name, func,
GINT_TO_POINTER(index));
{
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);
* @brief Add file selection list to a collection
* @param[in] selection_list Selection list of ::_FileData
* @param[in] data Index to the collection list menu item selected, or -1 for new collection
- *
- *
+ *
+ *
*/
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);
- collection_name = g_list_nth_data(collection_list, index);
+ 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);
projects / geeqie.git / blobdiff