Committing the calendar publishing patch.

svn path=/trunk/; revision=30876

1 files changed, 31 insertions, 43 deletions

diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
index 5c92570d37..ab717d85a9 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ b/calendar/gui/dialogs/cal-prefs-dialog.h
@@ -2,10 +2,10 @@
 
 /* 
  * Author : 
+ *  David Trowbridge <trowbrds cs colorado edu>
  *  Damon Chaplin <damon@ximian.com>
  *
- * Copyright 2000, Ximian, Inc.
- * Copyright 2000, Ximian, Inc.
+ * Copyright (C) 2005 Novell, Inc. (www.novell.com)
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
@@ -18,13 +18,8 @@
  *
  * 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
- */
-
-/*
- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog
- * to edit the calendar preference settings.
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
  */
 
 #ifndef _CAL_PREFS_DIALOG_H_
@@ -32,28 +27,22 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
-#include "../e-pub-utils.h"
 #include "evolution-config-control.h"
 
 G_BEGIN_DECLS
 
-enum {
-	URL_LIST_ENABLED_COLUMN,
-	URL_LIST_LOCATION_COLUMN,
-	URL_LIST_FREE_BUSY_URL_COLUMN,
-	URL_LIST_N_COLUMNS
-};
+typedef struct _CalendarPrefsDialog CalendarPrefsDialog;
+typedef struct _CalendarPrefsDialogClass CalendarPrefsDialogClass;
 
-struct _DialogData {
-	/* Glade XML data */
-	GladeXML *xml;
-	
-	GConfClient *gconf;
+struct _CalendarPrefsDialog {
+	GtkVBox parent;
 
-	GtkWidget *page;
+	GladeXML *gui;
 
+	GConfClient *gconf;
+
+	/* General tab */
 	GtkWidget *timezone;
 	GtkWidget *working_days[7];
 	GtkWidget *week_start_day;
@@ -61,41 +50,40 @@ struct _DialogData {
 	GtkWidget *end_of_day;
 	GtkWidget *use_12_hour;
 	GtkWidget *use_24_hour;
+	GtkWidget *confirm_delete;
+	GtkWidget *default_reminder;
+	GtkWidget *default_reminder_interval;
+	GtkWidget *default_reminder_units;
+
+	/* Display tab */
 	GtkWidget *time_divisions;
 	GtkWidget *show_end_times;
 	GtkWidget *compress_weekend;
 	GtkWidget *dnav_show_week_no;
-
-	/* Widgets for the task list options */
 	GtkWidget *tasks_due_today_color;
 	GtkWidget *tasks_overdue_color;
+	GtkWidget *tasks_hide_completed;
+	GtkWidget *tasks_hide_completed_interval;
+	GtkWidget *tasks_hide_completed_units;
 
-	GtkWidget *tasks_hide_completed_checkbutton;
-	GtkWidget *tasks_hide_completed_spinbutton;
-	GtkWidget *tasks_hide_completed_optionmenu;
-	
-	/* Widgets for the Free/Busy options */
+	/* Free/Busy tab */
 	GtkWidget *url_add;
 	GtkWidget *url_edit;
 	GtkWidget *url_remove;
 	GtkWidget *url_enable;
-	GtkTreeView *url_list;
-	gboolean url_editor;
-	GtkWidget* url_editor_dlg;
+	GtkWidget *url_enable_label;
+	GtkWidget *url_enable_image;
+	GtkWidget *url_list;
+	GtkWidget *template_url;
 	guint destroyed : 1;
+};
 
-	/* widgets for the Free/Busy template */
-	GtkWidget *template_url;
-		
-	/* Other page options */
-	GtkWidget *confirm_delete;
-	GtkWidget *default_reminder;
-	GtkWidget *default_reminder_interval;
-	GtkWidget *default_reminder_units;
+struct _CalendarPrefsDialogClass {
+	GtkVBoxClass parent;
 };
-typedef struct _DialogData DialogData;
 
-EvolutionConfigControl *cal_prefs_dialog_new (void);
+GType      calendar_prefs_dialog_get_type (void);
+GtkWidget *calendar_prefs_dialog_new (void);
 
 G_END_DECLS