X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmerge-init.c;h=f8f02d6fe683aebe3f960f55d630e992371d0d46;hb=db2403f05e4bd16e08346e4896e8feead63d0b12;hp=b62551bede5bb91bf5f7c5adc4da36f001294218;hpb=9971dd3e6268224ee930a26fdb30f22395406233;p=glabels

diff --git a/src/merge-init.c b/src/merge-init.c
index b62551be..f8f02d6f 100644
--- a/src/merge-init.c
+++ b/src/merge-init.c
@@ -1,32 +1,30 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-
 /*
- *  (GLABELS) Label and Business Card Creation program for GNOME
- *
- *  merge.c:  document merge initialization
+ *  merge-init.c
+ *  Copyright (C) 2002-2009  Jim Evins <evins@snaught.com>.
  *
- *  Copyright (C) 2001-2002  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/>.
  */
+
 #include <config.h>
 
 #include <glib/gi18n.h>
 
 #include "merge-init.h"
 #include "merge-text.h"
+
 #ifdef HAVE_LIBEBOOK
 #include "merge-evolution.h"
 #include "merge-vcard.h"
@@ -56,39 +54,89 @@ gl_merge_init (void)
 
 	gl_merge_register_backend (GL_TYPE_MERGE_TEXT,
 				   "Text/Comma",
-				   _("Text file with comma delimeters (CSV)"),
+				   _("Text: Comma Separated Values (CSV)"),
 				   GL_MERGE_SRC_IS_FILE,
 				   "delim", ',',
 				   NULL);
 
 	gl_merge_register_backend (GL_TYPE_MERGE_TEXT,
-				   "Text/Colon",
-				   _("Text file with colon delimeters"),
+				   "Text/Comma/Line1Keys",
+				   _("Text: Comma Separated Values (CSV) with keys on line 1"),
 				   GL_MERGE_SRC_IS_FILE,
-				   "delim", ':',
+				   "delim", ',',
+                                   "line1_has_keys", TRUE,
 				   NULL);
 
 	gl_merge_register_backend (GL_TYPE_MERGE_TEXT,
 				   "Text/Tab",
-				   _("Text file with tab delimeters"),
+				   _("Text: Tab Separated Values (TSV)"),
 				   GL_MERGE_SRC_IS_FILE,
 				   "delim", '\t',
 				   NULL);
 
+	gl_merge_register_backend (GL_TYPE_MERGE_TEXT,
+				   "Text/Tab/Line1Keys",
+				   _("Text: Tab Separated Values (TSV) with keys on line 1"),
+				   GL_MERGE_SRC_IS_FILE,
+				   "delim", '\t',
+                                   "line1_has_keys", TRUE,
+				   NULL);
+
+	gl_merge_register_backend (GL_TYPE_MERGE_TEXT,
+				   "Text/Colon",
+				   _("Text: Colon separated values"),
+				   GL_MERGE_SRC_IS_FILE,
+				   "delim", ':',
+				   NULL);
+
+	gl_merge_register_backend (GL_TYPE_MERGE_TEXT,
+				   "Text/Colon/Line1Keys",
+				   _("Text: Colon separated values with keys on line 1"),
+				   GL_MERGE_SRC_IS_FILE,
+				   "delim", ':',
+                                   "line1_has_keys", TRUE,
+				   NULL);
+
+        gl_merge_register_backend (GL_TYPE_MERGE_TEXT,
+                                   "Text/Semicolon",
+                                   _("Text: Semicolon separated values"),
+                                   GL_MERGE_SRC_IS_FILE,
+                                   "delim", ';',
+                                   NULL);
+
+        gl_merge_register_backend (GL_TYPE_MERGE_TEXT,
+                                   "Text/Semicolon/Line1Keys",
+                                   _("Text: Semicolon separated values with keys on line 1"),
+                                   GL_MERGE_SRC_IS_FILE,
+                                   "delim", ';',
+                                   "line1_has_keys", TRUE,
+                                   NULL);
+
 #ifdef HAVE_LIBEBOOK
 
 	gl_merge_register_backend (GL_TYPE_MERGE_EVOLUTION,
 				   "ebook/eds",
-				   _("Data from default Evolution Addressbook"),
+				   _("Evolution Addressbook"),
 				   GL_MERGE_SRC_IS_FIXED,
 				   NULL);
 
 	gl_merge_register_backend (GL_TYPE_MERGE_VCARD,
 				   "ebook/vcard",
-				   _("Data from a file containing VCards"),
+				   _("VCards"),
 				   GL_MERGE_SRC_IS_FILE,
 				   NULL);
 
 #endif /* HAVE_LIBEBOOK */
 
 }
+
+
+
+/*
+ * Local Variables:       -- emacs
+ * mode: C                -- emacs
+ * c-basic-offset: 8      -- emacs
+ * tab-width: 8           -- emacs
+ * indent-tabs-mode: nil  -- emacs
+ * End:                   -- emacs
+ */