r19273 by craig - Move naming of Chinese back to CJK

scribus-commit scribus-commit at lists.scribus.net
Mon Jun 23 16:37:45 UTC 2014


Author: craig
Date: Mon Jun 23 16:37:44 2014
New Revision: 19273

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19273
Log:
Move naming of Chinese back to CJK

Modified:
    trunk/Scribus/scribus/numeration.cpp
    trunk/Scribus/scribus/numeration.h
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
    trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
    trunk/Scribus/scribus/ui/prefs_documentsections.cpp
    trunk/Scribus/scribus/util.cpp
    trunk/Scribus/scribus/util.h
    trunk/Scribus/scribus/util_debug.cpp

Modified: trunk/Scribus/scribus/numeration.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19273&path=/trunk/Scribus/scribus/numeration.cpp
==============================================================================
--- trunk/Scribus/scribus/numeration.cpp (original)
+++ trunk/Scribus/scribus/numeration.cpp Mon Jun 23 16:37:44 2014
@@ -32,8 +32,8 @@
 		name = "A_B_C";
 	else if (format == Type_asterix)
 		name = "*";
-	else if (format == Type_Chinese)
-		name = "Chinese";
+	else if (format == Type_CJK)
+		name = "CJK";
 	Q_ASSERT(!name.isEmpty());
 	return name;
 }
@@ -41,7 +41,7 @@
 const QStringList getFormatList()
 {
 	QStringList list;
-	list << "1_2_3" << "i_ii_iii" << "I_II_III" << "a_b_c" << "A_B_C" << "*" << "Chinese";
+	list << "1_2_3" << "i_ii_iii" << "I_II_III" << "a_b_c" << "A_B_C" << "*" << "CJK";
 	return list;
 }
 

Modified: trunk/Scribus/scribus/numeration.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19273&path=/trunk/Scribus/scribus/numeration.h
==============================================================================
--- trunk/Scribus/scribus/numeration.h (original)
+++ trunk/Scribus/scribus/numeration.h Mon Jun 23 16:37:44 2014
@@ -13,7 +13,7 @@
 	Type_a_b_c,
 	Type_A_B_C,
 	Type_asterix,
-	Type_Chinese,
+	Type_CJK,
 	Type_None=99
 } NumFormat;
 

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19273&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format.cpp Mon Jun 23 16:37:44 2014
@@ -3305,8 +3305,8 @@
 				NS.setType(Type_A_B_C);
 			else if (type == "Type_asterix")
 				NS.setType(Type_asterix);
-			else if (type == "Type_Chinese")
-				NS.setType(Type_Chinese);
+			else if (type == "Type_CJK")
+				NS.setType(Type_CJK);
 			else //if (type == "Type_None")
 				NS.setType(Type_None);
 			NS.setRange((NumerationRange) attrs.valueAsInt("Range"));
@@ -3466,8 +3466,8 @@
 				newSection.type=Type_a_b_c;
 			if (type == "Type_A_B_C")
 				newSection.type=Type_A_B_C;
-			if (type == "Type_Chinese")
-				newSection.type=Type_Chinese;
+			if (type == "Type_CJK")
+				newSection.type=Type_CJK;
 			if (type == "Type_None")
 				newSection.type=Type_None;
 			newSection.sectionstartindex = attrs.valueAsInt("Start");

Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19273&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/scribus150format_save.cpp Mon Jun 23 16:37:44 2014
@@ -1215,8 +1215,8 @@
 			case Type_asterix:
 				docu.writeAttribute("Type", "Type_asterix");
 				break;
-			case Type_Chinese:
-				docu.writeAttribute("Type", "Type_Chinese");
+			case Type_CJK:
+				docu.writeAttribute("Type", "Type_CJK");
 				break;
 			case Type_None:
 				docu.writeAttribute("Type", "Type_None");

Modified: trunk/Scribus/scribus/ui/prefs_documentsections.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19273&path=/trunk/Scribus/scribus/ui/prefs_documentsections.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsections.cpp (original)
+++ trunk/Scribus/scribus/ui/prefs_documentsections.cpp Mon Jun 23 16:37:44 2014
@@ -38,7 +38,7 @@
 	localSections=prefsData->docSectionMap;
 	m_maxpageindex=m_doc->DocPages.count()-1;
 	styles.clear();
-	styles << tr("1, 2, 3, ...") << tr("i, ii, iii, ...") << tr("I, II, III, ...") << tr("a, b, c, ...") << tr("A, B, C, ...") << tr("*") << tr("Chinese") << CommonStrings::tr_None;
+	styles << tr("1, 2, 3, ...") << tr("i, ii, iii, ...") << tr("I, II, III, ...") << tr("a, b, c, ...") << tr("A, B, C, ...") << tr("*") << tr("CJK") << CommonStrings::tr_None;
 
 	updateTable();
 }

Modified: trunk/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19273&path=/trunk/Scribus/scribus/util.cpp
==============================================================================
--- trunk/Scribus/scribus/util.cpp (original)
+++ trunk/Scribus/scribus/util.cpp Mon Jun 23 16:37:44 2014
@@ -564,8 +564,8 @@
 			for (uint a=1; a <= position; ++a)
 				retVal.append(asterix);
 			break;
-		case Type_Chinese:
-			retVal=arabicToChinese(position);
+		case Type_CJK:
+			retVal=arabicToCJK(position);
 		case Type_None:
 			break;
 		default:
@@ -1133,21 +1133,21 @@
 }
 
 
-const QString arabicToChinese(uint i)
+const QString arabicToCJK(uint i)
 {
 	QString result;
 	if (i<10)
-		result = QString(chineseDigit(i));
+		result = QString(cjkDigit(i));
 
 	if (i>9 && i<=99)
 	{
 		int tens=i/10;
 		int ones=i%10;
 		if (tens!=1)
-			result.append(chineseDigit(tens));
-		result.append(chineseDigit(10));
+			result.append(cjkDigit(tens));
+		result.append(cjkDigit(10));
 		if (ones!=0)
-			result.append(chineseDigit(ones));
+			result.append(cjkDigit(ones));
 	}
 
 	if (i>99 && i<=999)
@@ -1155,23 +1155,23 @@
 		int hundreds=i/100;
 		int tens=(i-hundreds*100)/10;
 		int ones=i%10;
-		result.append(chineseDigit(hundreds));
-		result.append(chineseDigit(100));
+		result.append(cjkDigit(hundreds));
+		result.append(cjkDigit(100));
 		if (tens!=0)
 		{
-			result.append(chineseDigit(tens));
-			result.append(chineseDigit(10));
+			result.append(cjkDigit(tens));
+			result.append(cjkDigit(10));
 		}
 		else if (ones!=0)
-			result.append(chineseDigit(0));
+			result.append(cjkDigit(0));
 		if (ones!=0)
-			result.append(chineseDigit(ones));
+			result.append(cjkDigit(ones));
 	}
 	return result;
 }
 
 
-QChar chineseDigit(uint i)
+QChar cjkDigit(uint i)
 {
 	switch (i)
 	{

Modified: trunk/Scribus/scribus/util.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19273&path=/trunk/Scribus/scribus/util.h
==============================================================================
--- trunk/Scribus/scribus/util.h (original)
+++ trunk/Scribus/scribus/util.h Mon Jun 23 16:37:44 2014
@@ -131,8 +131,8 @@
 //default is '*' but can be used any string
 const QString SCRIBUS_API getStringFromSequence(NumFormat type, uint position, QString asterix="*");
 const QString SCRIBUS_API arabicToRoman(uint i);
-const QString SCRIBUS_API arabicToChinese(uint i);
-QChar SCRIBUS_API chineseDigit(uint i);
+const QString SCRIBUS_API arabicToCJK(uint i);
+QChar SCRIBUS_API cjkDigit(uint i);
 const QString SCRIBUS_API numberToLetterSequence(uint i);
 void SCRIBUS_API parsePagesString(QString pages, std::vector<int>* pageNs, int sourcePageCount);
 

Modified: trunk/Scribus/scribus/util_debug.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19273&path=/trunk/Scribus/scribus/util_debug.cpp
==============================================================================
--- trunk/Scribus/scribus/util_debug.cpp (original)
+++ trunk/Scribus/scribus/util_debug.cpp Mon Jun 23 16:37:44 2014
@@ -30,29 +30,6 @@
 #endif
 #include <QDateTime>
 #include "util_debug.h"
-/*
-#include <algorithm>
-#include "util.h"
-#include <zlib.h>
-
-#include <QApplication>
-#include <QCryptographicHash>
-#include <QDomElement>
-#include <QMessageBox>
-#include <QProcess>
-
-#include "pageitem.h"
-#include "pageitem_table.h"
-#include "scribusview.h"
-#include "scribusdoc.h"
-#include "scpainter.h"
-
-#include <signal.h>
-
-
-
-using namespace std;
-*/
 
 void sDebug(QString message)
 {




More information about the scribus-commit mailing list