2009-02-21 JimEvins <evins@snaught.com>

[glabels] / glabels2 / src / prefs-model.h

diff --git a/glabels2/src/prefs-model.h b/glabels2/src/prefs-model.h
index fc2f93f6dd78b848547d68ba0fa4fb87f56b7a57..23937fd9736607c68ee41e563e492f39617cde78 100644 (file)
--- a/glabels2/src/prefs-model.h
+++ b/glabels2/src/prefs-model.h
@@ -1,3 +1,5 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+
 /*
  *  (GLABELS) Label and Business Card Creation program for GNOME
  *
@@ -23,9 +25,9 @@
 #define __PREFS_MODEL_H__
 
 #include <glib-object.h>
-#include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
-#include <libgnomeprint/gnome-font.h>
+#include <pango/pango.h>
+#include <libglabels/enums.h>
 
 G_BEGIN_DECLS
 
@@ -35,12 +37,6 @@ typedef enum {
        GL_TOOLBAR_ICONS_AND_TEXT
 } glToolbarSetting;
 
-typedef enum {
-       GL_UNITS_PTS,
-       GL_UNITS_INCHES,
-       GL_UNITS_MM,
-} glPrefsUnits;
-
 #define GL_TYPE_PREFS_MODEL              (gl_prefs_model_get_type ())
 #define GL_PREFS_MODEL(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), GL_TYPE_PREFS_MODEL, glPrefsModel))
 #define GL_PREFS_MODEL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GL_TYPE_PREFS_MODEL, glPrefsModelClass))
@@ -61,7 +57,7 @@ struct _glPrefsModel {
        GConfClient      *gconf_client;
 
        /* Units */
-       glPrefsUnits      units;
+       lglUnitsType      units;
 
        /* Page size */
        gchar            *default_page_size;
@@ -69,10 +65,10 @@ struct _glPrefsModel {
        /* Text properties */
        gchar            *default_font_family;
        gdouble           default_font_size;
-       GnomeFontWeight   default_font_weight;
+       PangoWeight       default_font_weight;
        gboolean          default_font_italic_flag;
        guint             default_text_color;
-       GtkJustification  default_text_alignment;
+       PangoAlignment    default_text_alignment;
        gdouble           default_text_line_spacing;
        
        /* Line properties */
@@ -85,16 +81,12 @@ struct _glPrefsModel {
        /* User Interface/Main Toolbar */
        gboolean          main_toolbar_visible;
        glToolbarSetting  main_toolbar_buttons_style; 
-       gboolean          main_toolbar_view_tooltips;
 
        /* User Interface/Drawing Toolbar */
        gboolean          drawing_toolbar_visible;
-       glToolbarSetting  drawing_toolbar_buttons_style; 
-       gboolean          drawing_toolbar_view_tooltips;
 
        /* User Interface/Property Toolbar */
        gboolean          property_toolbar_visible;
-       gboolean          property_toolbar_view_tooltips;
 
        /* View properties */
        gboolean          grid_visible;
@@ -102,6 +94,10 @@ struct _glPrefsModel {
 
        /* Recent files */
        gint              max_recents;
+
+       /* Recent templates */
+        GSList           *recent_templates;
+       gint              max_recent_templates;
 };
 
 struct _glPrefsModelClass {