Addl fix #521: zoom increment is not multiplicative

[geeqie.git] / src / typedefs.h

diff --git a/src/typedefs.h b/src/typedefs.h
index a4a4033..2d9901b 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -28,6 +28,11 @@ typedef enum {
        ZOOM_RESET_NONE         = 2
 } ZoomMode;
 
+typedef enum {
+       ZOOM_GEOMETRIC  = 0,
+       ZOOM_ARITHMETIC = 1
+} ZoomStyle;
+
 typedef enum {
        CLIPBOARD_PRIMARY       = 0,
        CLIPBOARD_CLIPBOARD = 1,
@@ -154,6 +159,7 @@ typedef enum {
        FORMAT_CLASS_VIDEO,
        FORMAT_CLASS_COLLECTION,
        FORMAT_CLASS_DOCUMENT,
+       FORMAT_CLASS_ARCHIVE,
        FILE_FORMAT_CLASSES
 } FileFormatClass;
 
@@ -398,7 +404,7 @@ struct _AnimationData
        GdkPixbufAnimationIter *iter;
        GdkPixbuf *gpb;
        FileData *data_adr;
-       guint delay;
+       gint delay;
        gboolean valid;
        GCancellable *cancellable;
        GFile *in_file;
@@ -506,7 +512,7 @@ struct _ImageWindow
 
        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() */
@@ -599,6 +605,7 @@ struct _FileData {
        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;
@@ -710,6 +717,14 @@ struct _LayoutOptions
                gint y;
        } log_window;
 
+       struct {
+               gint w;
+               gint h;
+               gint x;
+               gint y;
+               gint page_number;
+       } preferences_window;
+
        struct {
                gint w;
                gint h;
@@ -724,6 +739,13 @@ struct _LayoutOptions
                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;
@@ -917,8 +939,8 @@ struct _ViewDirInfoTree
 
 struct _ViewFile
 {
-       FileViewType type;
-       // TODO(xsdg): Turn this into a union (see VFLIST and VFICON from view_file.h).
+       FileViewType type;      /**< @todo (xsdg): Turn this into a union (see VFLIST and VFICON from view_file.h). */
+
        gpointer info;
 
        GtkWidget *widget;
@@ -1011,7 +1033,7 @@ 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 */
+                                   @FIXME it is probably required only by img-view.c and should be dropped with it */
 
        GList *filelist;
        CollectionData *cd;