From 0f2abd1c64033b1848208a08161ecef0e0316752 Mon Sep 17 00:00:00 2001
From: Robin Stuart <rstuart114@gmail.com>
Date: Wed, 17 Feb 2016 13:01:56 +0000
Subject: [PATCH] Update GS1 DataBar names

To reflect changes made in 2011 revision of ISO/IEC 24724
---
 backend/rss.c               | 12 ++++++++++++
 frontend_qt4/mainwindow.cpp | 16 ++++++++--------
 frontend_qt4/mainwindow.h   | 12 ++++++------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/backend/rss.c b/backend/rss.c
index cb51c0d6..6e90ef8b 100644
--- a/backend/rss.c
+++ b/backend/rss.c
@@ -49,6 +49,18 @@
 */
 
 /* Includes numerous bugfixes thanks to Pablo Orduña @ the PIRAmIDE project */
+
+/* Note: This code reflects the symbol names as used in ISO/IEC 24724:2006. These names
+ * were updated in ISO/IEC 24724:2011 as follows:
+ * 
+ * RSS-14 > GS1 DataBar Omnidirectional
+ * RSS-14 Truncated > GS1 DataBar Truncated
+ * RSS-14 Stacked > GS1 DataBar Stacked
+ * RSS-14 Stacked Omnidirectional > GS1 DataBar Stacked Omnidirectional
+ * RSS Limited > GS1 DataBar Limited
+ * RSS Expanded > GS1 DataBar Expanded Omnidirectional
+ * RSS Expanded Stacked > GS1 DataBar Expanded Stacked Omnidirectional
+ */
 	
 #include <stdio.h>
 #include <string.h>
diff --git a/frontend_qt4/mainwindow.cpp b/frontend_qt4/mainwindow.cpp
index 0c4318d5..ee6fcdbf 100644
--- a/frontend_qt4/mainwindow.cpp
+++ b/frontend_qt4/mainwindow.cpp
@@ -53,12 +53,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl)
 		"Code 49",
 		"Code 93", 
 		"Code One",
-		"Databar",
-		"Databar Expanded",
-		"Databar Expanded Stacked",
-		"Databar Limited",
-		"Databar Stacked",
-		"Databar Stacked Omnidirectional",
 		"Data Matrix (ISO 16022)",
 		"Deutsche Post Identcode",
 		"Deutsche Post Leitcode",
@@ -68,6 +62,12 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl)
 		"Facing Identification Mark (FIM)",
 		"Flattermarken",
 		"Grid Matrix",
+		"GS1 DataBar Expanded Omnidirectional",
+		"GS1 DataBar Expanded Stacked Omnidirectional",
+		"GS1 DataBar Limited",
+		"GS1 DataBar Omnidirectional",                
+		"GS1 DataBar Stacked",
+		"GS1 DataBar Stacked Omnidirectional",                
 		"ITF-14",
 		"International Standard Book Number (ISBN)",
 		"Japanese Postal Barcode",
@@ -184,7 +184,7 @@ void MainWindow::about()
 					   "EN 797:1996, EN 798:1996, EN 12323:2005, ISO/IEC 15417:2007,<br>"
 					   "ISO/IEC 15438:2006, ISO/IEC 16022:2006, ISO/IEC 16023:2000,<br>"
 					   "ISO/IEC 16388:2007, ISO/IEC 18004:2006, ISO/IEC 24723:2006,<br>"
-					   "ISO/IEC 24724:2006, ISO/IEC 24728:2006, ISO/IEC 24778:2008,<br>"
+					   "ISO/IEC 24724:2011, ISO/IEC 24728:2006, ISO/IEC 24778:2008,<br>"
 					   "ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000, ANSI/AIM BC12-1998,<br>"
 					   "AIMD014 (v 1.63), USPS-B-3200</small></td></tr></table>"
 			     ));
@@ -466,7 +466,7 @@ void MainWindow::change_options()
 			return;
 		m_optionWidget=uiload.load(&file);
 		file.close();
-		tabMain->insertTab(1,m_optionWidget,tr("DataBar Stacked"));
+		tabMain->insertTab(1,m_optionWidget,tr("GS1 DataBar Stacked"));
 		connect(m_optionWidget->findChild<QObject*>("cmbCols"), SIGNAL(currentIndexChanged ( int )), SLOT(update_preview()));
 	}
 
diff --git a/frontend_qt4/mainwindow.h b/frontend_qt4/mainwindow.h
index 0b2f937a..5223f0be 100644
--- a/frontend_qt4/mainwindow.h
+++ b/frontend_qt4/mainwindow.h
@@ -60,12 +60,6 @@ public:
 		CODE49		=24,
 		CODE93		=25,
 		CODE_ONE	=141,
-		RSS14		=29,
-		RSS_EXP		=31,
-		RSS_EXPSTACK	=81,
-		RSS_LTD		=30,
-		RSS14STACK	=79,
-		RSS14STACK_OMNI	=80,
 		DATAMATRIX	=71,
 		DPIDENT		=22,
 		DPLEIT		=21,
@@ -75,6 +69,12 @@ public:
 		FIM		=49,
 		FLAT		=28,
 		GRIDMATRIX	=142,
+		RSS_EXP		=31,
+		RSS_EXPSTACK	=81,
+		RSS_LTD		=30,
+		RSS14		=29,                
+		RSS14STACK	=79,
+		RSS14STACK_OMNI	=80,                
 		ITF14		=89,
 		ISBNX		=69,
 		JAPANPOST	=76,