/*
- * Geeqie
- * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2012 The Geeqie Team
+ * Copyright (C) 2006 John Ellis
+ * Copyright (C) 2008 - 2016 The Geeqie Team
*
* Author: John Ellis
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
#ifndef TYPEDEFS_H
#define TYPEDEFS_H
ZOOM_RESET_NONE = 2
} ZoomMode;
+typedef enum {
+ ZOOM_GEOMETRIC = 0,
+ ZOOM_ARITHMETIC = 1
+} ZoomStyle;
+
+typedef enum {
+ CLIPBOARD_PRIMARY = 0,
+ CLIPBOARD_CLIPBOARD = 1,
+ CLIPBOARD_BOTH = 2
+} ClipboardSelection;
+
typedef enum {
MOUSE_BUTTON_LEFT = 1,
MOUSE_BUTTON_MIDDLE = 2,
MOUSE_BUTTON_RIGHT = 3,
MOUSE_BUTTON_WHEEL_UP = 4,
- MOUSE_BUTTON_WHEEL_DOWN = 5
+ MOUSE_BUTTON_WHEEL_DOWN = 5,
+ MOUSE_BUTTON_8 = 8,
+ MOUSE_BUTTON_9 = 9
} MouseButton;
typedef enum {
DIRVIEW_LIST,
- DIRVIEW_TREE
+ DIRVIEW_TREE,
+
+ DIRVIEW_LAST = DIRVIEW_TREE /**< Keep this up to date! */
} DirViewType;
typedef enum {
FILEVIEW_LIST,
- FILEVIEW_ICON
+ FILEVIEW_ICON,
+
+ FILEVIEW_LAST = FILEVIEW_ICON /**< Keep this up to date! */
} FileViewType;
#define CMD_COPY "geeqie-copy-command.desktop"
SORT_CTIME,
SORT_PATH,
SORT_NUMBER,
- SORT_EXIFTIME
+ SORT_EXIFTIME,
+ SORT_EXIFTIMEDIGITIZED,
+ SORT_RATING,
+ SORT_CLASS
} SortType;
+/**
+ * @typedef DnDAction
+ * drag and drop default action
+ */
+typedef enum {
+ DND_ACTION_ASK,
+ DND_ACTION_COPY,
+ DND_ACTION_MOVE
+} DnDAction;
+
typedef enum {
- ALTER_NONE, /* do nothing */
+ ALTER_NONE, /**< do nothing */
ALTER_ROTATE_90,
- ALTER_ROTATE_90_CC, /* counterclockwise */
+ ALTER_ROTATE_90_CC, /**< counterclockwise */
ALTER_ROTATE_180,
ALTER_MIRROR,
ALTER_FLIP,
FORMAT_CLASS_IMAGE,
FORMAT_CLASS_RAWIMAGE,
FORMAT_CLASS_META,
+ FORMAT_CLASS_VIDEO,
+ FORMAT_CLASS_COLLECTION,
+ FORMAT_CLASS_DOCUMENT,
+ FORMAT_CLASS_ARCHIVE,
FILE_FORMAT_CLASSES
} FileFormatClass;
+extern gchar *format_class_list[]; /**< defined in preferences.c */
+
+/**
+ * @typedef SecureSaveErrno
+ * see err field in #SecureSaveInfo
+ */
typedef enum {
SS_ERR_NONE = 0,
SS_ERR_DISABLED, /**< secsave is disabled. */
SS_ERR_OUT_OF_MEM, /**< memory allocation failure */
- /* see err field in SecureSaveInfo */
SS_ERR_OPEN_READ,
SS_ERR_OPEN_WRITE,
SS_ERR_STAT,
} NotifyPriority;
typedef enum {
- NOTIFY_MARKS = 1 << 1, /* changed marks */
- NOTIFY_PIXBUF = 1 << 2, /* image was read into fd->pixbuf */
- NOTIFY_HISTMAP = 1 << 3, /* histmap was read into fd->histmap */
- NOTIFY_ORIENTATION = 1 << 4, /* image was rotated */
- NOTIFY_METADATA = 1 << 5, /* changed image metadata, not yet written */
- NOTIFY_GROUPING = 1 << 6, /* change in fd->sidecar_files or fd->parent */
- NOTIFY_REREAD = 1 << 7, /* changed file size, date, etc., file name remains unchanged */
- NOTIFY_CHANGE = 1 << 8 /* generic change described by fd->change */
+ NOTIFY_MARKS = 1 << 1, /**< changed marks */
+ NOTIFY_PIXBUF = 1 << 2, /**< image was read into fd->pixbuf */
+ NOTIFY_HISTMAP = 1 << 3, /**< histmap was read into fd->histmap */
+ NOTIFY_ORIENTATION = 1 << 4, /**< image was rotated */
+ NOTIFY_METADATA = 1 << 5, /**< changed image metadata, not yet written */
+ NOTIFY_GROUPING = 1 << 6, /**< change in fd->sidecar_files or fd->parent */
+ NOTIFY_REREAD = 1 << 7, /**< changed file size, date, etc., file name remains unchanged */
+ NOTIFY_CHANGE = 1 << 8 /**< generic change described by fd->change */
} NotifyType;
typedef enum {
CHANGE_WARN_CHANGED_EXT = 1 << 3,
CHANGE_WARN_UNSAVED_META = 1 << 4,
CHANGE_WARN_NO_WRITE_PERM_DEST_DIR = 1 << 5,
- CHANGE_ERROR_MASK = (~0) << 8, /* the values below are fatal errors */
+ CHANGE_ERROR_MASK = (~0U) << 8, /**< the values below are fatal errors */
CHANGE_NO_READ_PERM = 1 << 8,
CHANGE_NO_WRITE_PERM_DIR = 1 << 9,
CHANGE_NO_DEST_DIR = 1 << 10,
+ CHANGE_DUPLICATE_DEST = 1 << 11,
CHANGE_NO_WRITE_PERM_DEST = 1 << 12,
CHANGE_DEST_EXISTS = 1 << 13,
CHANGE_NO_SRC = 1 << 14,
} ChangeError;
typedef enum {
- METADATA_PLAIN = 0, /* format that can be edited and written back */
- METADATA_FORMATTED = 1 /* for display only */
+ METADATA_PLAIN = 0, /**< format that can be edited and written back */
+ METADATA_FORMATTED = 1 /**< for display only */
} MetadataFormat;
typedef enum {
} ToolbarType;
typedef enum {
- PR_STEREO_NONE = 0, /* do nothing */
- PR_STEREO_DUAL = 1 << 0, /* independent stereo buffers, for example nvidia opengl */
- PR_STEREO_FIXED = 1 << 1, /* custom position */
- PR_STEREO_HORIZ = 1 << 2, /* side by side */
- PR_STEREO_VERT = 1 << 3, /* above below */
- PR_STEREO_RIGHT = 1 << 4, /* render right buffer */
- PR_STEREO_ANAGLYPH_RC = 1 << 5, /* anaglyph red-cyan */
- PR_STEREO_ANAGLYPH_GM = 1 << 6, /* anaglyph green-magenta */
- PR_STEREO_ANAGLYPH_YB = 1 << 7, /* anaglyph yellow-blue */
- PR_STEREO_ANAGLYPH_GRAY_RC = 1 << 8, /* anaglyph gray red-cyan*/
- PR_STEREO_ANAGLYPH_GRAY_GM = 1 << 9, /* anaglyph gray green-magenta */
- PR_STEREO_ANAGLYPH_GRAY_YB = 1 << 10, /* anaglyph gray yellow-blue */
- PR_STEREO_ANAGLYPH_DB_RC = 1 << 11, /* anaglyph dubois red-cyan */
- PR_STEREO_ANAGLYPH_DB_GM = 1 << 12, /* anaglyph dubois green-magenta */
- PR_STEREO_ANAGLYPH_DB_YB = 1 << 13, /* anaglyph dubois yellow-blue */
+ PR_STEREO_NONE = 0, /**< do nothing */
+ PR_STEREO_DUAL = 1 << 0, /**< independent stereo buffers, for example nvidia opengl */
+ PR_STEREO_FIXED = 1 << 1, /**< custom position */
+ PR_STEREO_HORIZ = 1 << 2, /**< side by side */
+ PR_STEREO_VERT = 1 << 3, /**< above below */
+ PR_STEREO_RIGHT = 1 << 4, /**< render right buffer */
+ PR_STEREO_ANAGLYPH_RC = 1 << 5, /**< anaglyph red-cyan */
+ PR_STEREO_ANAGLYPH_GM = 1 << 6, /**< anaglyph green-magenta */
+ PR_STEREO_ANAGLYPH_YB = 1 << 7, /**< anaglyph yellow-blue */
+ PR_STEREO_ANAGLYPH_GRAY_RC = 1 << 8, /**< anaglyph gray red-cyan*/
+ PR_STEREO_ANAGLYPH_GRAY_GM = 1 << 9, /**< anaglyph gray green-magenta */
+ PR_STEREO_ANAGLYPH_GRAY_YB = 1 << 10, /**< anaglyph gray yellow-blue */
+ PR_STEREO_ANAGLYPH_DB_RC = 1 << 11, /**< anaglyph dubois red-cyan */
+ PR_STEREO_ANAGLYPH_DB_GM = 1 << 12, /**< anaglyph dubois green-magenta */
+ PR_STEREO_ANAGLYPH_DB_YB = 1 << 13, /**< anaglyph dubois yellow-blue */
PR_STEREO_ANAGLYPH = PR_STEREO_ANAGLYPH_RC |
PR_STEREO_ANAGLYPH_GM |
PR_STEREO_ANAGLYPH_YB |
PR_STEREO_ANAGLYPH_GRAY_YB |
PR_STEREO_ANAGLYPH_DB_RC |
PR_STEREO_ANAGLYPH_DB_GM |
- PR_STEREO_ANAGLYPH_DB_YB, /* anaglyph mask */
+ PR_STEREO_ANAGLYPH_DB_YB, /**< anaglyph mask */
- PR_STEREO_MIRROR_LEFT = 1 << 14, /* mirror */
- PR_STEREO_FLIP_LEFT = 1 << 15, /* flip */
+ PR_STEREO_MIRROR_LEFT = 1 << 14, /**< mirror */
+ PR_STEREO_FLIP_LEFT = 1 << 15, /**< flip */
- PR_STEREO_MIRROR_RIGHT = 1 << 16, /* mirror */
- PR_STEREO_FLIP_RIGHT = 1 << 17, /* flip */
+ PR_STEREO_MIRROR_RIGHT = 1 << 16, /**< mirror */
+ PR_STEREO_FLIP_RIGHT = 1 << 17, /**< flip */
- PR_STEREO_MIRROR = PR_STEREO_MIRROR_LEFT | PR_STEREO_MIRROR_RIGHT, /* mirror mask*/
- PR_STEREO_FLIP = PR_STEREO_FLIP_LEFT | PR_STEREO_FLIP_RIGHT, /* flip mask*/
- PR_STEREO_SWAP = 1 << 18, /* swap left and right buffers */
- PR_STEREO_TEMP_DISABLE = 1 << 19, /* temporarily disable stereo mode if source image is not stereo */
+ PR_STEREO_MIRROR = PR_STEREO_MIRROR_LEFT | PR_STEREO_MIRROR_RIGHT, /**< mirror mask*/
+ PR_STEREO_FLIP = PR_STEREO_FLIP_LEFT | PR_STEREO_FLIP_RIGHT, /**< flip mask*/
+ PR_STEREO_SWAP = 1 << 18, /**< swap left and right buffers */
+ PR_STEREO_TEMP_DISABLE = 1 << 19, /**< temporarily disable stereo mode if source image is not stereo */
PR_STEREO_HALF = 1 << 20
} PixbufRendererStereoMode;
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 {
+ SELECTION_NONE = 0,
+ SELECTION_SELECTED = 1 << 0,
+ SELECTION_PRELIGHT = 1 << 1,
+ SELECTION_FOCUS = 1 << 2
+} SelectionType;
+
typedef struct _ImageLoader ImageLoader;
typedef struct _ThumbLoader ThumbLoader;
+typedef struct _AnimationData AnimationData;
+
typedef struct _CollectInfo CollectInfo;
typedef struct _CollectionData CollectionData;
typedef struct _CollectTable CollectTable;
typedef struct _CommandLine CommandLine;
struct _Histogram {
- gint histogram_channel; /* drawing mode for histogram */
- gint histogram_mode; /* logarithmical or not */
- guint vgrid; /* number of vertical divisions, 0 for none */
- guint hgrid; /* number of horizontal divisions, 0 for none */
+ gint histogram_channel; /**< drawing mode for histogram */
+ gint histogram_mode; /**< logarithmical or not */
+ guint vgrid; /**< number of vertical divisions, 0 for none */
+ guint hgrid; /**< number of horizontal divisions, 0 for none */
struct {
- int R; /* red */
- int G; /* green */
- int B; /* blue */
- int A; /* alpha */
- } grid_color; /* grid color */
+ int R; /**< red */
+ int G; /**< green */
+ int B; /**< blue */
+ int A; /**< alpha */
+ } grid_color; /**< grid color */
};
gboolean standard_loader;
ImageLoader *il;
- FileData *fd; /* fd->pixbuf contains final (scaled) image when done */
+ FileData *fd; /**< fd->pixbuf contains final (scaled) image when done */
gboolean cache_enable;
gboolean cache_hit;
gpointer data;
- guint idle_done_id; /* event source id */
+ guint idle_done_id; /**< event source id */
+};
+
+struct _AnimationData
+{
+ ImageWindow *iw;
+ LayoutWindow *lw;
+ GdkPixbufAnimation *gpa;
+ GdkPixbufAnimationIter *iter;
+ GdkPixbuf *gpb;
+ FileData *data_adr;
+ gint delay;
+ gboolean valid;
+ GCancellable *cancellable;
+ GFile *in_file;
+ GFileInputStream *gfstream;
};
struct _CollectInfo
gint window_w;
gint window_h;
- /* contents changed since save flag */
- gboolean changed;
+ gboolean changed; /**< contents changed since save flag */
GHashTable *existence;
};
CollectInfo *click_info;
GtkWidget *tip_window;
- guint tip_delay_id; /* event source id */
+ guint tip_delay_id; /**< event source id */
CollectInfo *tip_info;
GdkWindow *marker_window;
CollectInfo *drop_info;
GList *drop_list;
- guint sync_idle_id; /* event source id */
- guint drop_idle_id; /* event source id */
+ guint sync_idle_id; /**< event source id */
+ guint drop_idle_id; /**< event source id */
gboolean show_text;
+ gboolean show_stars;
- /* file list for edit menu */
- GList *editmenu_fd_list;
+ GList *editmenu_fd_list; /**< file list for edit menu */
};
struct _CollectWindow
GtkWidget *window;
CollectTable *table;
GtkWidget *status_box;
- GList *list;
GtkWidget *close_dialog;
struct _ImageWindow
{
- GtkWidget *widget; /* use this to add it and show it */
+ GtkWidget *widget; /**< use this to add it and show it */
GtkWidget *pr;
GtkWidget *frame;
FileData *image_fd;
- gboolean unknown; /* failed to load image */
+ gboolean unknown; /**< failed to load image */
- ImageLoader *il; /* FIXME - image loader should probably go to FileData, but it must first support
+ ImageLoader *il; /**< @FIXME image loader should probably go to FileData, but it must first support
sending callbacks to multiple ImageWindows in parallel */
- gint has_frame; /* not boolean, see image_new() */
+ gint has_frame; /**< not boolean, see image_new() */
/* top level (not necessarily parent) window */
- gboolean top_window_sync; /* resize top_window when image dimensions change */
- GtkWidget *top_window; /* window that gets title, and window to resize when 'fitting' */
- gchar *title; /* window title to display left of file name */
- gchar *title_right; /* window title to display right of file name */
- gboolean title_show_zoom; /* option to include zoom in window title */
+ gboolean top_window_sync; /**< resize top_window when image dimensions change */
+ GtkWidget *top_window; /**< window that gets title, and window to resize when 'fitting' */
+ gchar *title; /**< window title to display left of file name */
+ gchar *title_right; /**< window title to display right of file name */
+ gboolean title_show_zoom; /**< option to include zoom in window title */
gboolean completed;
- ImageState state; /* mask of IMAGE_STATE_* flags about current image */
+ ImageState state; /**< mask of IMAGE_STATE_* flags about current image */
void (*func_update)(ImageWindow *imd, gpointer data);
void (*func_complete)(ImageWindow *imd, gint preload, gpointer data);
/* button, scroll functions */
void (*func_button)(ImageWindow *, GdkEventButton *event, gpointer);
- void (*func_drag)(ImageWindow *, GdkEventButton *event, gdouble dx, gdouble dy, gpointer);
+ void (*func_drag)(ImageWindow *, GdkEventMotion *event, gdouble dx, gdouble dy, gpointer);
void (*func_scroll)(ImageWindow *, GdkEventScroll *event, gpointer);
void (*func_focus_in)(ImageWindow *, gpointer);
gpointer data_scroll;
gpointer data_focus_in;
- /* scroll notification (for scroll bar implementation) */
+ /**
+ * @headerfile func_scroll_notify
+ * scroll notification (for scroll bar implementation)
+ */
void (*func_scroll_notify)(ImageWindow *, gint x, gint y, gint width, gint height, gpointer);
gpointer data_scroll_notify;
gboolean delay_flip;
gint orientation;
gboolean desaturate;
+ gboolean overunderexposed;
gint user_stereo;
+
+ gboolean mouse_wheel_mode;
};
-#define FILEDATA_MARKS_SIZE 6
+#define FILEDATA_MARKS_SIZE 10
struct _FileDataChangeInfo {
FileDataChangeType type;
struct _FileData {
guint magick;
gint type;
- gchar *original_path; /* key to file_data_pool hash table */
+ gchar *original_path; /**< key to file_data_pool hash table */
gchar *path;
const gchar *name;
const gchar *extension;
+ gchar *extended_extension;
+ FileFormatClass format_class;
+ gchar *format_name; /**< set by the image loader */
gchar *collate_key_name;
gchar *collate_key_name_nocase;
gint64 size;
time_t date;
time_t cdate;
- mode_t mode; /* this is needed at least for notification in view_dir because it is preserved after the file/directory is deleted */
+ mode_t mode; /**< this is needed at least for notification in view_dir because it is preserved after the file/directory is deleted */
gint sidecar_priority;
- guint marks; /* each bit represents one mark */
- guint valid_marks; /* zero bit means that the corresponding mark needs to be reread */
+ guint marks; /**< each bit represents one mark */
+ guint valid_marks; /**< zero bit means that the corresponding mark needs to be reread */
GList *sidecar_files;
- FileData *parent; /* parent file if this is a sidecar file, NULL otherwise */
- FileDataChangeInfo *change; /* for rename, move ... */
+ FileData *parent; /**< parent file if this is a sidecar file, NULL otherwise */
+ FileDataChangeInfo *change; /**< for rename, move ... */
GdkPixbuf *thumb_pixbuf;
- GdkPixbuf *pixbuf; /* full-size image, only complete images, NULL during loading
+ GdkPixbuf *pixbuf; /**< full-size image, only complete images, NULL during loading
all FileData with non-NULL pixbuf are referenced by image_cache */
HistMap *histmap;
gboolean locked;
gint ref;
- gint version; /* increased when any field in this structure is changed */
+ gint version; /**< increased when any field in this structure is changed */
gboolean disable_grouping;
gint user_orientation;
ExifData *exif;
time_t exifdate;
- GHashTable *modified_xmp; // hash table which contains unwritten xmp metadata in format: key->list of string values
+ time_t exifdate_digitized;
+ GHashTable *modified_xmp; /**< hash table which contains unwritten xmp metadata in format: key->list of string values */
GList *cached_metadata;
+ gint rating;
+ gboolean metadata_in_idle_loaded;
+
+ gchar *owner;
+ gchar *group;
+ gchar *sym_link;
+
+ SelectionType selected; /**< Used by view_file_icon. */
+
+ gint page_num;
+ gint page_total;
};
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;
gboolean show_directory_date;
gboolean show_info_pixel;
+ gboolean split_pane_sync;
+ gboolean ignore_alpha;
struct {
gint w;
gint vdivider_pos;
} float_window;
+ struct {
+ gint vdivider_pos;
+ } folder_window;
+
struct {
gint w;
gint h;
gint histogram_mode;
} image_overlay;
+ struct {
+ gint w;
+ gint h;
+ gint x;
+ gint y;
+ } log_window;
+
+ struct {
+ gint w;
+ gint h;
+ gint x;
+ gint y;
+ gint page_number;
+ } preferences_window;
+
+ struct {
+ gint w;
+ gint h;
+ gint x;
+ gint y;
+ } search_window;
+
+ struct {
+ gint w;
+ gint h;
+ gint x;
+ gint y;
+ } dupe_window;
+
+ struct {
+ gint w;
+ gint h;
+ gint x;
+ gint y;
+ } advanced_exif_window;
+
gboolean tools_float;
gboolean tools_hidden;
gboolean toolbar_hidden;
+ struct {
+ gboolean info;
+ gboolean sort;
+ gboolean tools_float;
+ gboolean tools_hidden;
+ gboolean hidden;
+ } bars_state;
+
gchar *home_path;
gchar *last_path;
StartUpPath startup_path;
- gboolean exit_on_close;
+ gboolean animate;
+ gint workspace;
+
+ SortActionType action;
+ SortModeType mode;
+ SortSelectionType selection;
+ gchar *filter_key;
};
struct _LayoutWindow
// gint tools_float;
// gint tools_hidden;
-
- GtkWidget *menu_bar; /* referenced by lw, exist during whole lw lifetime */
+ GtkWidget *menu_tool_bar; /**< Combined menu and toolbar box */
+ GtkWidget *menu_bar; /**< referenced by lw, exist during whole lw lifetime */
/* toolbar */
- GtkWidget *toolbar[TOOLBAR_COUNT]; /* referenced by lw, exist during whole lw lifetime */
+ GtkWidget *toolbar[TOOLBAR_COUNT]; /**< referenced by lw, exist during whole lw lifetime */
// gint toolbar_hidden;
// GtkWidget *thumb_button;
SortType sort_method;
gboolean sort_ascend;
- /* status bar */
-
- GtkWidget *info_box;
- GtkWidget *info_progress_bar;
- GtkWidget *info_sort;
- GtkWidget *info_status;
- GtkWidget *info_details;
- GtkWidget *info_zoom;
- GtkWidget *info_pixel;
+ GtkWidget *info_box; /**< status bar */
+ GtkWidget *info_progress_bar; /**< status bar */
+ GtkWidget *info_sort; /**< status bar */
+ GtkWidget *info_status; /**< status bar */
+ GtkWidget *info_details; /**< status bar */
+ GtkWidget *info_zoom; /**< status bar */
+ GtkWidget *info_pixel; /**< status bar */
/* slide show */
/* misc */
- GtkWidget *utility_box; /* referenced by lw, exist during whole lw lifetime */
- GtkWidget *utility_paned; /* between image and bar */
+ GtkWidget *utility_box; /**< referenced by lw, exist during whole lw lifetime */
+ GtkWidget *utility_paned; /**< between image and bar */
GtkWidget *bar_sort;
GtkWidget *bar;
-// gint bar_sort_enabled;
+ gboolean bar_sort_enabled; /**< Set during start-up, and checked when the editors have loaded */
// gint bar_enabled;
// gint bar_width;
GtkWidget *exif_window;
+ GtkWidget *sar_window; /**< Search and Run window */
+
+ AnimationData *animation;
+
+ GtkWidget *log_window;
};
struct _ViewDir
FileData *drop_fd;
GList *drop_list;
- guint drop_scroll_id; /* event source id */
+ guint drop_scroll_id; /**< event source id */
/* func list */
void (*select_func)(ViewDir *vd, FileData *fd, gpointer data);
struct _ViewDirInfoTree
{
- guint drop_expand_id; /* event source id */
+ guint drop_expand_id; /**< event source id */
gint busy_ref;
};
struct _ViewFile
{
- FileViewType type;
+ FileViewType type; /**< @todo (xsdg): Turn this into a union (see VFLIST and VFICON from view_file.h). */
+
gpointer info;
GtkWidget *widget;
GtkWidget *filter;
GtkWidget *filter_check[FILEDATA_MARKS_SIZE];
+ struct {
+ GtkWidget *combo;
+ GtkWidget *frame;
+ gint count;
+ gint last_selected;
+ gboolean case_sensitive;
+ } file_filter;
+
FileData *dir_fd;
GList *list;
gint active_mark;
gint clicked_mark;
+ /* stars */
+ FileData *stars_filedata;
+ guint stars_id;
+
/* refresh */
- guint refresh_idle_id; /* event source id */
- time_t time_refresh_set; /* time when refresh_idle_id was set */
+ guint refresh_idle_id; /**< event source id */
+ time_t time_refresh_set; /**< time when refresh_idle_id was set */
+
+ GList *editmenu_fd_list; /**< file list for edit menu */
- /* file list for edit menu */
- GList *editmenu_fd_list;
+ guint read_metadata_in_idle_id;
};
struct _ViewFileInfoList
gboolean thumbs_enabled;
- guint select_idle_id; /* event source id */
+ guint select_idle_id; /**< event source id */
};
-struct _IconData;
-
struct _ViewFileInfoIcon
{
/* table stuff */
gint rows;
GList *selection;
- struct _IconData *prev_selection;
+ FileData *prev_selection;
GtkWidget *tip_window;
- guint tip_delay_id; /* event source id */
- struct _IconData *tip_id;
+ guint tip_delay_id; /**< event source id */
+ FileData *tip_fd;
- struct _IconData *click_id;
+ FileData *click_fd;
- struct _IconData *focus_id;
+ FileData *focus_fd;
gint focus_row;
gint focus_column;
struct _SlideShowData
{
- LayoutWindow *lw; /* use this window to display the slideshow */
- ImageWindow *imd; /* use this window only if lw is not available,
- FIXME: it is probably required only by img-view.c and should be dropped with it */
+ LayoutWindow *lw; /**< use this window to display the slideshow */
+ ImageWindow *imd; /**< use this window only if lw is not available,
+ @FIXME it is probably required only by img-view.c and should be dropped with it */
GList *filelist;
CollectionData *cd;
FileData *slide_fd;
guint slide_count;
- guint timeout_id; /* event source id */
+ guint timeout_id; /**< event source id */
gboolean from_selection;
GtkWidget *normal_window;
ImageWindow *normal_imd;
- guint hide_mouse_id; /* event source id */
- guint busy_mouse_id; /* event source id */
+ guint hide_mouse_id; /**< event source id */
+ guint busy_mouse_id; /**< event source id */
gint cursor_state;
- guint saver_block_id; /* event source id */
+ guint saver_block_id; /**< event source id */
void (*stop_func)(FullScreenData *, gpointer);
gpointer stop_data;
- gboolean same_region; /* the returned region will overlap the current location of widget. */
+ gboolean same_region; /**< the returned region will overlap the current location of widget. */
};
struct _PixmapFolders
GdkPixbuf *open;
GdkPixbuf *deny;
GdkPixbuf *parent;
+ GdkPixbuf *link;
};
struct _SecureSaveInfo {
gboolean startup_command_line_collection;
gboolean tools_hide;
gboolean tools_show;
+ gboolean log_window_show;
gchar *path;
gchar *file;
GList *cmd_list;
GList *collection_list;
gchar *geometry;
+ gchar *regexp;
+ gchar *log_file;
+ SecureSaveInfo *ssi;
+ gboolean new_instance;
};
#endif