Fix #756: Set default option for file drag-drop, skipping "Move/Copy/Symlink" popup

[geeqie.git] / src / typedefs.h

diff --git a/src/typedefs.h b/src/typedefs.h
index 1067798..fab68a8 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -79,6 +79,13 @@ typedef enum {
        SORT_CLASS
 } SortType;
 
+/* drag and drop default action */
+typedef enum {
+       DND_ACTION_ASK,
+       DND_ACTION_COPY,
+       DND_ACTION_MOVE
+} DnDAction;
+
 typedef enum {
        ALTER_NONE,             /* do nothing */
        ALTER_ROTATE_90,
@@ -148,6 +155,7 @@ typedef enum {
        FILE_FORMAT_CLASSES
 } FileFormatClass;
 
+/* defined in preferences.c */
 extern gchar *format_class_list[];
 
 typedef enum {
@@ -264,6 +272,25 @@ typedef enum {
        STEREO_PIXBUF_NONE     = 3
 } StereoPixbufData;
 
+typedef enum {
+       BAR_SORT_MODE_FOLDER = 0,
+       BAR_SORT_MODE_COLLECTION,
+       BAR_SORT_MODE_COUNT
+} SortModeType;
+
+typedef enum {
+       BAR_SORT_COPY = 0,
+       BAR_SORT_MOVE,
+       BAR_SORT_FILTER,
+       BAR_SORT_ACTION_COUNT
+} SortActionType;
+
+typedef enum {
+       BAR_SORT_SELECTION_IMAGE = 0,
+       BAR_SORT_SELECTION_SELECTED,
+       BAR_SORT_SELECTION_COUNT
+} SortSelectionType;
+
 #define MAX_SPLIT_IMAGES 4
 
 typedef enum {
@@ -625,6 +652,11 @@ struct _LayoutOptions
        DirViewType dir_view_type;
        FileViewType file_view_type;
 
+       struct {
+               SortType method;
+               gboolean ascend;
+       } dir_view_list_sort;
+
        gboolean show_thumbnails;
        gboolean show_marks;
        gboolean show_file_filter;
@@ -691,6 +723,11 @@ struct _LayoutOptions
        gboolean exit_on_close;
 
        gboolean animate;
+
+       SortActionType action;
+       SortModeType mode;
+       SortSelectionType selection;
+       gchar *filter_key;
 };
 
 struct _LayoutWindow
@@ -811,6 +848,7 @@ struct _LayoutWindow
 //     gint bar_width;
 
        GtkWidget *exif_window;
+       GtkWidget *sar_window; /* Search and Run window */
 
        AnimationData *animation;
 
@@ -876,6 +914,7 @@ struct _ViewFile
                GtkWidget *frame;
                gint count;
                gint last_selected;
+               gboolean case_sensitive;
        } file_filter;
 
        FileData *dir_fd;
@@ -1033,6 +1072,7 @@ struct _CommandLine
        gchar *regexp;
        gchar *log_file;
        SecureSaveInfo *ssi;
+       gboolean new_instance;
 };
 
 #endif