2009-09-22 Jim Evins <evins@snaught.com>

[glabels] / glabels2 / src / object-editor-private.h

diff --git a/glabels2/src/object-editor-private.h b/glabels2/src/object-editor-private.h
index 188064258da530fbc697b2c9ab66fc9ca58da7ef..6858075955cc23e4a87070c4c9c5f6b8d0b26607 100644 (file)
--- a/glabels2/src/object-editor-private.h
+++ b/glabels2/src/object-editor-private.h
@@ -1,39 +1,37 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
- *
- *  object-editor-private.h:  object properties editor module private header file
+ *  object-editor-private.h
+ *  Copyright (C) 2003-2009  Jim Evins <evins@snaught.com>.
  *
- *  Copyright (C) 2003  Jim Evins <evins@snaught.com>.
+ *  This file is part of gLabels.
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  gLabels 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
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
+ *  gLabels 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *  along with gLabels.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #ifndef __OBJECT_EDITOR_PRIVATE_H__
 #define __OBJECT_EDITOR_PRIVATE_H__
 
-#include <gtk/gtkwidget.h>
-#include <glade/glade-xml.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
 struct _glObjectEditorPrivate {
 
-       GladeXML   *gui;
+       GtkBuilder *builder;
        GtkWidget  *editor_vbox;
 
+        glLabel    *label;
+
        gdouble     units_per_point;
 
        GtkWidget  *title_image;
@@ -55,6 +53,7 @@ struct _glObjectEditorPrivate {
        GtkWidget  *size_h_spin;
        GtkWidget  *size_w_units_label;
        GtkWidget  *size_h_units_label;
+       GtkWidget  *size_aspect_vbox;
        GtkWidget  *size_aspect_checkbutton;
        GtkWidget  *size_reset_image_button;
        gdouble     size_aspect_ratio;
@@ -75,6 +74,7 @@ struct _glObjectEditorPrivate {
        gdouble     dy_max;
 
        GtkWidget  *fill_page_vbox;
+       GtkWidget  *fill_color_hbox;
        GtkWidget  *fill_color_combo;
        GtkWidget  *fill_key_combo;
        GtkWidget  *fill_key_radio;
@@ -83,6 +83,7 @@ struct _glObjectEditorPrivate {
        GtkWidget  *line_page_vbox;
        GtkWidget  *line_width_spin;
        GtkWidget  *line_color_radio;
+       GtkWidget  *line_color_hbox;
        GtkWidget  *line_color_combo;
        GtkWidget  *line_key_radio;
        GtkWidget  *line_key_combo;
@@ -94,11 +95,13 @@ struct _glObjectEditorPrivate {
        GtkWidget  *img_key_combo;
 
        GtkWidget  *text_page_vbox;
+       GtkWidget  *text_family_hbox;
        GtkWidget  *text_family_combo;
        GtkWidget  *text_size_spin;
        GtkWidget  *text_bold_toggle;
        GtkWidget  *text_italic_toggle;
        GtkWidget  *text_color_radio;
+       GtkWidget  *text_color_hbox;
        GtkWidget  *text_color_combo;
        GtkWidget  *text_color_key_radio;
        GtkWidget  *text_color_key_combo;
@@ -118,6 +121,7 @@ struct _glObjectEditorPrivate {
        GtkWidget  *bc_text_check;
        GtkWidget  *bc_cs_check;
        GtkWidget  *bc_color_radio;
+       GtkWidget  *bc_color_hbox;
        GtkWidget  *bc_color_combo;
        GtkWidget  *bc_key_radio;
        GtkWidget  *bc_key_combo;
@@ -142,6 +146,7 @@ struct _glObjectEditorPrivate {
        GtkWidget  *shadow_y_units_label;
        GtkWidget  *shadow_color_radio;
        GtkWidget  *shadow_key_radio;
+       GtkWidget  *shadow_color_hbox;
        GtkWidget  *shadow_color_combo;
        GtkWidget  *shadow_key_combo;
        GtkWidget  *shadow_opacity_spin;
@@ -199,3 +204,14 @@ void shadow_prefs_changed_cb                    (glObjectEditor        *editor);
 G_END_DECLS
 
 #endif
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */