Update new-release.sh

[geeqie.git] / src / typedefs.h

diff --git a/src/typedefs.h b/src/typedefs.h
index ad4c1a3..167c59a 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;
@@ -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;
@@ -1096,5 +1118,21 @@ struct _CommandLine
        gboolean new_instance;
 };
 
+/**
+ * @struct _hard_coded_window_keys
+ * @brief hard coded window shortcut keys
+ * 
+ * Used for two purposes:\n
+ * to display the shortcuts keys in popup menus\n
+ * used by ./doc/create-shortcuts-xml.sh to generate shortcut documentation in the Help files
+ * 
+ */
+typedef struct _hard_coded_window_keys hard_coded_window_keys;
+struct _hard_coded_window_keys {
+       GdkModifierType mask; /**< modifier key mask */
+       guint key_value;  /**< GDK_keyval */
+       gchar *text;  /**< menu item label - NULL if end of list */
+};
+
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */